diff --git a/.depcheckrc.yml b/.depcheckrc.yml
index e8fe7a446ec..5a506bc7a51 100644
--- a/.depcheckrc.yml
+++ b/.depcheckrc.yml
@@ -4,8 +4,6 @@ ignores:
- 'webpack-cli'
- '@react-native-community/datetimepicker'
- '@react-native-community/slider'
- - 'patch-package'
- - '@lavamoat/allow-scripts'
# This is used on the patch for TokenRatesController of Assets controllers, for we to be able to use the last version of it
- cockatiel
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 536976ae751..ef0325cdc08 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -63,32 +63,3 @@ patches/react-native+0.*.patch @MetaMask/supply-chain
# Staking Team
app/components/UI/Stake @MetaMask/metamask-staking
-
-# Assets Team
-app/components/hooks/useIsOriginalNativeTokenSymbol @MetaMask/metamask-assets
-app/components/hooks/useTokenBalancesController @MetaMask/metamask-assets
-app/components/hooks/useTokenBalance.tsx @MetaMask/metamask-assets
-app/components/hooks/useSafeChains.ts @MetaMask/metamask-assets
-app/components/UI/AssetOverview @MetaMask/metamask-assets
-app/components/UI/Collectibles @MetaMask/metamask-assets
-app/components/UI/CollectibleContractElement @MetaMask/metamask-assets
-app/components/UI/CollectivelContractInformation @MetaMask/metamask-assets
-app/components/UI/CollectibleContractOverview @MetaMask/metamask-assets
-app/components/UI/CollectibleContracts @MetaMask/metamask-assets
-app/components/UI/CollectibleDetectionModal @MetaMask/metamask-assets
-app/components/UI/CollectibleMedia @MetaMask/metamask-assets
-app/components/UI/CollectibleModal @MetaMask/metamask-assets
-app/components/UI/CollectibleOverview @MetaMask/metamask-assets
-app/components/UI/ConfirmAddAsset @MetaMask/metamask-assets
-app/components/UI/Tokens @MetaMask/metamask-assets
-app/components/Views/AddAsset @MetaMask/metamask-assets
-app/components/Views/Asset @MetaMask/metamask-assets
-app/components/Views/AssetDetails @MetaMask/metamask-assets
-app/components/Views/AssetHideConfirmation @MetaMask/metamask-assets
-app/components/Views/AssetOptions @MetaMask/metamask-assets
-app/components/Views/Collectible @MetaMask/metamask-assets
-app/components/Views/CollectibleView @MetaMask/metamask-assets
-app/components/Views/DetectedTokens @MetaMask/metamask-assets
-app/components/Views/NFTAutoDetectionModal @MetaMask/metamask-assets
-app/components/Views/NftDetails @MetaMask/metamask-assets
-app/reducers/collectibles @MetaMask/metamask-assets
diff --git a/.github/scripts/bitrise/.yarnrc b/.github/scripts/bitrise/.yarnrc
deleted file mode 100644
index 5455c6c5d38..00000000000
--- a/.github/scripts/bitrise/.yarnrc
+++ /dev/null
@@ -1 +0,0 @@
-ignore-scripts true
diff --git a/.github/scripts/package.json b/.github/scripts/package.json
deleted file mode 100644
index e2bf8d85b07..00000000000
--- a/.github/scripts/package.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "name": "@metamask/mobile-ci-scripts",
- "private": true,
- "scripts": {
- "add-release-label-to-pr-and-linked-issues": "ts-node ./add-release-label-to-pr-and-linked-issues.ts",
- "fitness-functions": "ts-node ./fitness-functions/index.ts",
- "check-pr-has-required-labels": "ts-node ./check-pr-has-required-labels.ts",
- "close-release-bug-report-issue": "ts-node ./close-release-bug-report-issue.ts",
- "check-template-and-add-labels": "ts-node ./check-template-and-add-labels.ts",
- "run-bitrise-e2e-check": "ts-node ./bitrise/run-bitrise-e2e-check.ts"
- },
- "dependencies": {
- "@actions/core": "^1.10.1",
- "@actions/github": "^6.0.0",
- "axios": "^1.7.4",
- "simple-git": "^3.25.0"
- },
- "devDependencies": {
- "@lavamoat/allow-scripts": "^3.2.0",
- "@lavamoat/preinstall-always-fail": "^2.1.0",
- "@types/node": "^20.16.2",
- "ts-node": "^10.5.0",
- "typescript": "~5.4.5"
- },
- "packageManager": "yarn@1.22.22",
- "lavamoat": {
- "allowScripts": {
- "@lavamoat/preinstall-always-fail": false,
- "ts-node>@swc/core": false
- }
- }
-}
diff --git a/.github/scripts/tsconfig.json b/.github/scripts/tsconfig.json
deleted file mode 100644
index 4082f16a5d9..00000000000
--- a/.github/scripts/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "extends": "../../tsconfig.json"
-}
diff --git a/.github/scripts/yarn.lock b/.github/scripts/yarn.lock
deleted file mode 100644
index 0a66131a3c4..00000000000
--- a/.github/scripts/yarn.lock
+++ /dev/null
@@ -1,1318 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@actions/core@^1.10.1":
- version "1.10.1"
- resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.10.1.tgz#61108e7ac40acae95ee36da074fa5850ca4ced8a"
- integrity sha512-3lBR9EDAY+iYIpTnTIXmWcNbX3T2kCkAEQGIQx4NVQ0575nk2k3GRZDTPQG+vVtS2izSLmINlxXf0uLtnrTP+g==
- dependencies:
- "@actions/http-client" "^2.0.1"
- uuid "^8.3.2"
-
-"@actions/github@^6.0.0":
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/@actions/github/-/github-6.0.0.tgz#65883433f9d81521b782a64cc1fd45eef2191ea7"
- integrity sha512-alScpSVnYmjNEXboZjarjukQEzgCRmjMv6Xj47fsdnqGS73bjJNDpiiXmp8jr0UZLdUB6d9jW63IcmddUP+l0g==
- dependencies:
- "@actions/http-client" "^2.2.0"
- "@octokit/core" "^5.0.1"
- "@octokit/plugin-paginate-rest" "^9.0.0"
- "@octokit/plugin-rest-endpoint-methods" "^10.0.0"
-
-"@actions/http-client@^2.0.1", "@actions/http-client@^2.2.0":
- version "2.2.3"
- resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-2.2.3.tgz#31fc0b25c0e665754ed39a9f19a8611fc6dab674"
- integrity sha512-mx8hyJi/hjFvbPokCg4uRd4ZX78t+YyRPtnKWwIl+RzNaVuFpQHfmlGVfsKEJN8LwTCvL+DfVgAM04XaHkm6bA==
- dependencies:
- tunnel "^0.0.6"
- undici "^5.25.4"
-
-"@cspotcode/source-map-support@^0.8.0":
- version "0.8.1"
- resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
- integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
- dependencies:
- "@jridgewell/trace-mapping" "0.3.9"
-
-"@fastify/busboy@^2.0.0":
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.1.1.tgz#b9da6a878a371829a0502c9b6c1c143ef6663f4d"
- integrity sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==
-
-"@isaacs/cliui@^8.0.2":
- version "8.0.2"
- resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
- integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
- dependencies:
- string-width "^5.1.2"
- string-width-cjs "npm:string-width@^4.2.0"
- strip-ansi "^7.0.1"
- strip-ansi-cjs "npm:strip-ansi@^6.0.1"
- wrap-ansi "^8.1.0"
- wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
-
-"@jridgewell/resolve-uri@^3.0.3":
- version "3.1.2"
- resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
- integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
-
-"@jridgewell/sourcemap-codec@^1.4.10":
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a"
- integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
-
-"@jridgewell/trace-mapping@0.3.9":
- version "0.3.9"
- resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
- integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
- dependencies:
- "@jridgewell/resolve-uri" "^3.0.3"
- "@jridgewell/sourcemap-codec" "^1.4.10"
-
-"@kwsites/file-exists@^1.1.1":
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/@kwsites/file-exists/-/file-exists-1.1.1.tgz#ad1efcac13e1987d8dbaf235ef3be5b0d96faa99"
- integrity sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==
- dependencies:
- debug "^4.1.1"
-
-"@kwsites/promise-deferred@^1.1.1":
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz#8ace5259254426ccef57f3175bc64ed7095ed919"
- integrity sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==
-
-"@lavamoat/aa@^4.3.0":
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/@lavamoat/aa/-/aa-4.3.0.tgz#eabc756f3838971e05321335035ae11f2b1aaf8a"
- integrity sha512-Kwf64RpLDvWCzHdG1IEItGf0JfMH9DyjBhIAj1NNJQzmKIaFE/DCc6INKJu7iVqp7aVdKaVB3aJlV4/lKOmJDg==
- dependencies:
- resolve "1.22.8"
-
-"@lavamoat/allow-scripts@^3.2.0":
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/@lavamoat/allow-scripts/-/allow-scripts-3.2.0.tgz#bbd0f0039cf28670f0911b71af2c7554e0400872"
- integrity sha512-UQmyNgOY4OLsHqv8YrRTvsf61NSp1rCO+NXAQNWxtG+qyrvPYqo5rfj3PdmwUOlwAHebPSVfc4Yz7+Eg+DRxkg==
- dependencies:
- "@lavamoat/aa" "^4.3.0"
- "@npmcli/run-script" "8.1.0"
- bin-links "4.0.4"
- npm-normalize-package-bin "3.0.1"
- yargs "17.7.2"
-
-"@lavamoat/preinstall-always-fail@^2.1.0":
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/@lavamoat/preinstall-always-fail/-/preinstall-always-fail-2.1.0.tgz#048d71940d83d424e2ef625a8b81c4dc6d64645c"
- integrity sha512-9xSsxxryPMyBWxfV+Ver7FZhvC1PhE1wDCsYFwsiqZzmeWH8e7Y7gWRFJqPw4M8WNbfeuPhKbLdCK3GsPz9gKg==
-
-"@npmcli/agent@^2.0.0":
- version "2.2.2"
- resolved "https://registry.yarnpkg.com/@npmcli/agent/-/agent-2.2.2.tgz#967604918e62f620a648c7975461c9c9e74fc5d5"
- integrity sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==
- dependencies:
- agent-base "^7.1.0"
- http-proxy-agent "^7.0.0"
- https-proxy-agent "^7.0.1"
- lru-cache "^10.0.1"
- socks-proxy-agent "^8.0.3"
-
-"@npmcli/fs@^3.1.0":
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.1.tgz#59cdaa5adca95d135fc00f2bb53f5771575ce726"
- integrity sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==
- dependencies:
- semver "^7.3.5"
-
-"@npmcli/git@^5.0.0":
- version "5.0.8"
- resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-5.0.8.tgz#8ba3ff8724192d9ccb2735a2aa5380a992c5d3d1"
- integrity sha512-liASfw5cqhjNW9UFd+ruwwdEf/lbOAQjLL2XY2dFW/bkJheXDYZgOyul/4gVvEV4BWkTXjYGmDqMw9uegdbJNQ==
- dependencies:
- "@npmcli/promise-spawn" "^7.0.0"
- ini "^4.1.3"
- lru-cache "^10.0.1"
- npm-pick-manifest "^9.0.0"
- proc-log "^4.0.0"
- promise-inflight "^1.0.1"
- promise-retry "^2.0.1"
- semver "^7.3.5"
- which "^4.0.0"
-
-"@npmcli/node-gyp@^3.0.0":
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz#101b2d0490ef1aa20ed460e4c0813f0db560545a"
- integrity sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==
-
-"@npmcli/package-json@^5.0.0":
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-5.2.0.tgz#a1429d3111c10044c7efbfb0fce9f2c501f4cfad"
- integrity sha512-qe/kiqqkW0AGtvBjL8TJKZk/eBBSpnJkUWvHdQ9jM2lKHXRYYJuyNpJPlJw3c8QjC2ow6NZYiLExhUaeJelbxQ==
- dependencies:
- "@npmcli/git" "^5.0.0"
- glob "^10.2.2"
- hosted-git-info "^7.0.0"
- json-parse-even-better-errors "^3.0.0"
- normalize-package-data "^6.0.0"
- proc-log "^4.0.0"
- semver "^7.5.3"
-
-"@npmcli/promise-spawn@^7.0.0":
- version "7.0.2"
- resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-7.0.2.tgz#1d53d34ffeb5d151bfa8ec661bcccda8bbdfd532"
- integrity sha512-xhfYPXoV5Dy4UkY0D+v2KkwvnDfiA/8Mt3sWCGI/hM03NsYIH8ZaG6QzS9x7pje5vHZBZJ2v6VRFVTWACnqcmQ==
- dependencies:
- which "^4.0.0"
-
-"@npmcli/run-script@8.1.0":
- version "8.1.0"
- resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-8.1.0.tgz#a563e5e29b1ca4e648a6b1bbbfe7220b4bfe39fc"
- integrity sha512-y7efHHwghQfk28G2z3tlZ67pLG0XdfYbcVG26r7YIXALRsrVQcTq4/tdenSmdOrEsNahIYA/eh8aEVROWGFUDg==
- dependencies:
- "@npmcli/node-gyp" "^3.0.0"
- "@npmcli/package-json" "^5.0.0"
- "@npmcli/promise-spawn" "^7.0.0"
- node-gyp "^10.0.0"
- proc-log "^4.0.0"
- which "^4.0.0"
-
-"@octokit/auth-token@^4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-4.0.0.tgz#40d203ea827b9f17f42a29c6afb93b7745ef80c7"
- integrity sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==
-
-"@octokit/core@^5.0.1":
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/@octokit/core/-/core-5.2.0.tgz#ddbeaefc6b44a39834e1bb2e58a49a117672a7ea"
- integrity sha512-1LFfa/qnMQvEOAdzlQymH0ulepxbxnCYAKJZfMci/5XJyIHWgEYnDmgnKakbTh7CH2tFQ5O60oYDvns4i9RAIg==
- dependencies:
- "@octokit/auth-token" "^4.0.0"
- "@octokit/graphql" "^7.1.0"
- "@octokit/request" "^8.3.1"
- "@octokit/request-error" "^5.1.0"
- "@octokit/types" "^13.0.0"
- before-after-hook "^2.2.0"
- universal-user-agent "^6.0.0"
-
-"@octokit/endpoint@^9.0.1":
- version "9.0.5"
- resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-9.0.5.tgz#e6c0ee684e307614c02fc6ac12274c50da465c44"
- integrity sha512-ekqR4/+PCLkEBF6qgj8WqJfvDq65RH85OAgrtnVp1mSxaXF03u2xW/hUdweGS5654IlC0wkNYC18Z50tSYTAFw==
- dependencies:
- "@octokit/types" "^13.1.0"
- universal-user-agent "^6.0.0"
-
-"@octokit/graphql@^7.1.0":
- version "7.1.0"
- resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-7.1.0.tgz#9bc1c5de92f026648131f04101cab949eeffe4e0"
- integrity sha512-r+oZUH7aMFui1ypZnAvZmn0KSqAUgE1/tUXIWaqUCa1758ts/Jio84GZuzsvUkme98kv0WFY8//n0J1Z+vsIsQ==
- dependencies:
- "@octokit/request" "^8.3.0"
- "@octokit/types" "^13.0.0"
- universal-user-agent "^6.0.0"
-
-"@octokit/openapi-types@^20.0.0":
- version "20.0.0"
- resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-20.0.0.tgz#9ec2daa0090eeb865ee147636e0c00f73790c6e5"
- integrity sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==
-
-"@octokit/openapi-types@^22.2.0":
- version "22.2.0"
- resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-22.2.0.tgz#75aa7dcd440821d99def6a60b5f014207ae4968e"
- integrity sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==
-
-"@octokit/plugin-paginate-rest@^9.0.0":
- version "9.2.1"
- resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.2.1.tgz#2e2a2f0f52c9a4b1da1a3aa17dabe3c459b9e401"
- integrity sha512-wfGhE/TAkXZRLjksFXuDZdmGnJQHvtU/joFQdweXUgzo1XwvBCD4o4+75NtFfjfLK5IwLf9vHTfSiU3sLRYpRw==
- dependencies:
- "@octokit/types" "^12.6.0"
-
-"@octokit/plugin-rest-endpoint-methods@^10.0.0":
- version "10.4.1"
- resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-10.4.1.tgz#41ba478a558b9f554793075b2e20cd2ef973be17"
- integrity sha512-xV1b+ceKV9KytQe3zCVqjg+8GTGfDYwaT1ATU5isiUyVtlVAO3HNdzpS4sr4GBx4hxQ46s7ITtZrAsxG22+rVg==
- dependencies:
- "@octokit/types" "^12.6.0"
-
-"@octokit/request-error@^5.1.0":
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-5.1.0.tgz#ee4138538d08c81a60be3f320cd71063064a3b30"
- integrity sha512-GETXfE05J0+7H2STzekpKObFe765O5dlAKUTLNGeH+x47z7JjXHfsHKo5z21D/o/IOZTUEI6nyWyR+bZVP/n5Q==
- dependencies:
- "@octokit/types" "^13.1.0"
- deprecation "^2.0.0"
- once "^1.4.0"
-
-"@octokit/request@^8.3.0", "@octokit/request@^8.3.1":
- version "8.4.0"
- resolved "https://registry.yarnpkg.com/@octokit/request/-/request-8.4.0.tgz#7f4b7b1daa3d1f48c0977ad8fffa2c18adef8974"
- integrity sha512-9Bb014e+m2TgBeEJGEbdplMVWwPmL1FPtggHQRkV+WVsMggPtEkLKPlcVYm/o8xKLkpJ7B+6N8WfQMtDLX2Dpw==
- dependencies:
- "@octokit/endpoint" "^9.0.1"
- "@octokit/request-error" "^5.1.0"
- "@octokit/types" "^13.1.0"
- universal-user-agent "^6.0.0"
-
-"@octokit/types@^12.6.0":
- version "12.6.0"
- resolved "https://registry.yarnpkg.com/@octokit/types/-/types-12.6.0.tgz#8100fb9eeedfe083aae66473bd97b15b62aedcb2"
- integrity sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==
- dependencies:
- "@octokit/openapi-types" "^20.0.0"
-
-"@octokit/types@^13.0.0", "@octokit/types@^13.1.0":
- version "13.5.0"
- resolved "https://registry.yarnpkg.com/@octokit/types/-/types-13.5.0.tgz#4796e56b7b267ebc7c921dcec262b3d5bfb18883"
- integrity sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==
- dependencies:
- "@octokit/openapi-types" "^22.2.0"
-
-"@pkgjs/parseargs@^0.11.0":
- version "0.11.0"
- resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
- integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
-
-"@tsconfig/node10@^1.0.7":
- version "1.0.11"
- resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.11.tgz#6ee46400685f130e278128c7b38b7e031ff5b2f2"
- integrity sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==
-
-"@tsconfig/node12@^1.0.7":
- version "1.0.11"
- resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
- integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
-
-"@tsconfig/node14@^1.0.0":
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
- integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
-
-"@tsconfig/node16@^1.0.2":
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
- integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
-
-"@types/node@^20.16.2":
- version "20.16.2"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.2.tgz#9e388f503a5af306e8c63319334887390966a11e"
- integrity sha512-91s/n4qUPV/wg8eE9KHYW1kouTfDk2FPGjXbBMfRWP/2vg1rCXNQL1OCabwGs0XSdukuK+MwCDXE30QpSeMUhQ==
- dependencies:
- undici-types "~6.19.2"
-
-abbrev@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf"
- integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==
-
-acorn-walk@^8.1.1:
- version "8.3.3"
- resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.3.tgz#9caeac29eefaa0c41e3d4c65137de4d6f34df43e"
- integrity sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==
- dependencies:
- acorn "^8.11.0"
-
-acorn@^8.11.0, acorn@^8.4.1:
- version "8.12.1"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
- integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
-
-agent-base@^7.0.2, agent-base@^7.1.0, agent-base@^7.1.1:
- version "7.1.1"
- resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317"
- integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==
- dependencies:
- debug "^4.3.4"
-
-aggregate-error@^3.0.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
- integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
- dependencies:
- clean-stack "^2.0.0"
- indent-string "^4.0.0"
-
-ansi-regex@^5.0.1:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
- integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-
-ansi-regex@^6.0.1:
- version "6.0.1"
- resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
- integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
-
-ansi-styles@^4.0.0:
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
- integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
- dependencies:
- color-convert "^2.0.1"
-
-ansi-styles@^6.1.0:
- version "6.2.1"
- resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
- integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
-
-arg@^4.1.0:
- version "4.1.3"
- resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
- integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
-
-asynckit@^0.4.0:
- version "0.4.0"
- resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
- integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
-
-axios@^1.7.4:
- version "1.7.5"
- resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.5.tgz#21eed340eb5daf47d29b6e002424b3e88c8c54b1"
- integrity sha512-fZu86yCo+svH3uqJ/yTdQ0QHpQu5oL+/QE+QPSv6BZSkDAoky9vytxp7u5qk83OJFS3kEBcesWni9WTZAv3tSw==
- dependencies:
- follow-redirects "^1.15.6"
- form-data "^4.0.0"
- proxy-from-env "^1.1.0"
-
-balanced-match@^1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
- integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-before-after-hook@^2.2.0:
- version "2.2.3"
- resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.3.tgz#c51e809c81a4e354084422b9b26bad88249c517c"
- integrity sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==
-
-bin-links@4.0.4:
- version "4.0.4"
- resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-4.0.4.tgz#c3565832b8e287c85f109a02a17027d152a58a63"
- integrity sha512-cMtq4W5ZsEwcutJrVId+a/tjt8GSbS+h0oNkdl6+6rBuEv8Ot33Bevj5KPm40t309zuhVic8NjpuL42QCiJWWA==
- dependencies:
- cmd-shim "^6.0.0"
- npm-normalize-package-bin "^3.0.0"
- read-cmd-shim "^4.0.0"
- write-file-atomic "^5.0.0"
-
-brace-expansion@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
- integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
- dependencies:
- balanced-match "^1.0.0"
-
-cacache@^18.0.0:
- version "18.0.4"
- resolved "https://registry.yarnpkg.com/cacache/-/cacache-18.0.4.tgz#4601d7578dadb59c66044e157d02a3314682d6a5"
- integrity sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==
- dependencies:
- "@npmcli/fs" "^3.1.0"
- fs-minipass "^3.0.0"
- glob "^10.2.2"
- lru-cache "^10.0.1"
- minipass "^7.0.3"
- minipass-collect "^2.0.1"
- minipass-flush "^1.0.5"
- minipass-pipeline "^1.2.4"
- p-map "^4.0.0"
- ssri "^10.0.0"
- tar "^6.1.11"
- unique-filename "^3.0.0"
-
-chownr@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
- integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
-
-clean-stack@^2.0.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
- integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-
-cliui@^8.0.1:
- version "8.0.1"
- resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
- integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
- dependencies:
- string-width "^4.2.0"
- strip-ansi "^6.0.1"
- wrap-ansi "^7.0.0"
-
-cmd-shim@^6.0.0:
- version "6.0.3"
- resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-6.0.3.tgz#c491e9656594ba17ac83c4bd931590a9d6e26033"
- integrity sha512-FMabTRlc5t5zjdenF6mS0MBeFZm0XqHqeOkcskKFb/LYCcRQ5fVgLOHVc4Lq9CqABd9zhjwPjMBCJvMCziSVtA==
-
-color-convert@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
- integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
- dependencies:
- color-name "~1.1.4"
-
-color-name@~1.1.4:
- version "1.1.4"
- resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
- integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-combined-stream@^1.0.8:
- version "1.0.8"
- resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
- integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
- dependencies:
- delayed-stream "~1.0.0"
-
-create-require@^1.1.0:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
- integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
-
-cross-spawn@^7.0.0:
- version "7.0.3"
- resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
- integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
- dependencies:
- path-key "^3.1.0"
- shebang-command "^2.0.0"
- which "^2.0.1"
-
-debug@4, debug@^4.1.1, debug@^4.3.4, debug@^4.3.5:
- version "4.3.6"
- resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b"
- integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==
- dependencies:
- ms "2.1.2"
-
-delayed-stream@~1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
- integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
-
-deprecation@^2.0.0:
- version "2.3.1"
- resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
- integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
-
-diff@^4.0.1:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
- integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
-
-eastasianwidth@^0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
- integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
-
-emoji-regex@^8.0.0:
- version "8.0.0"
- resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
- integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
-emoji-regex@^9.2.2:
- version "9.2.2"
- resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
- integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
-
-encoding@^0.1.13:
- version "0.1.13"
- resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
- integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
- dependencies:
- iconv-lite "^0.6.2"
-
-env-paths@^2.2.0:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
- integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
-
-err-code@^2.0.2:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
- integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
-
-escalade@^3.1.1:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
- integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
-
-exponential-backoff@^3.1.1:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
- integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
-
-follow-redirects@^1.15.6:
- version "1.15.6"
- resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
- integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
-
-foreground-child@^3.1.0:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.0.tgz#0ac8644c06e431439f8561db8ecf29a7b5519c77"
- integrity sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==
- dependencies:
- cross-spawn "^7.0.0"
- signal-exit "^4.0.1"
-
-form-data@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
- integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
- dependencies:
- asynckit "^0.4.0"
- combined-stream "^1.0.8"
- mime-types "^2.1.12"
-
-fs-minipass@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
- integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
- dependencies:
- minipass "^3.0.0"
-
-fs-minipass@^3.0.0:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.3.tgz#79a85981c4dc120065e96f62086bf6f9dc26cc54"
- integrity sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==
- dependencies:
- minipass "^7.0.3"
-
-function-bind@^1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
- integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
-
-get-caller-file@^2.0.5:
- version "2.0.5"
- resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
- integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
-glob@^10.2.2, glob@^10.3.10:
- version "10.4.5"
- resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
- integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
- dependencies:
- foreground-child "^3.1.0"
- jackspeak "^3.1.2"
- minimatch "^9.0.4"
- minipass "^7.1.2"
- package-json-from-dist "^1.0.0"
- path-scurry "^1.11.1"
-
-graceful-fs@^4.2.6:
- version "4.2.11"
- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
- integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
-
-hasown@^2.0.2:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
- integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
- dependencies:
- function-bind "^1.1.2"
-
-hosted-git-info@^7.0.0:
- version "7.0.2"
- resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-7.0.2.tgz#9b751acac097757667f30114607ef7b661ff4f17"
- integrity sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==
- dependencies:
- lru-cache "^10.0.1"
-
-http-cache-semantics@^4.1.1:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
- integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
-
-http-proxy-agent@^7.0.0:
- version "7.0.2"
- resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
- integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
- dependencies:
- agent-base "^7.1.0"
- debug "^4.3.4"
-
-https-proxy-agent@^7.0.1:
- version "7.0.5"
- resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz#9e8b5013873299e11fab6fd548405da2d6c602b2"
- integrity sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==
- dependencies:
- agent-base "^7.0.2"
- debug "4"
-
-iconv-lite@^0.6.2:
- version "0.6.3"
- resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
- integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
- dependencies:
- safer-buffer ">= 2.1.2 < 3.0.0"
-
-imurmurhash@^0.1.4:
- version "0.1.4"
- resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
- integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
-
-indent-string@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
- integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-
-ini@^4.1.3:
- version "4.1.3"
- resolved "https://registry.yarnpkg.com/ini/-/ini-4.1.3.tgz#4c359675a6071a46985eb39b14e4a2c0ec98a795"
- integrity sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==
-
-ip-address@^9.0.5:
- version "9.0.5"
- resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a"
- integrity sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==
- dependencies:
- jsbn "1.1.0"
- sprintf-js "^1.1.3"
-
-is-core-module@^2.13.0:
- version "2.15.1"
- resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37"
- integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==
- dependencies:
- hasown "^2.0.2"
-
-is-fullwidth-code-point@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
- integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
-is-lambda@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
- integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
-
-isexe@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
- integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
-
-isexe@^3.1.1:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/isexe/-/isexe-3.1.1.tgz#4a407e2bd78ddfb14bea0c27c6f7072dde775f0d"
- integrity sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==
-
-jackspeak@^3.1.2:
- version "3.4.3"
- resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a"
- integrity sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==
- dependencies:
- "@isaacs/cliui" "^8.0.2"
- optionalDependencies:
- "@pkgjs/parseargs" "^0.11.0"
-
-jsbn@1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
- integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==
-
-json-parse-even-better-errors@^3.0.0:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz#b43d35e89c0f3be6b5fbbe9dc6c82467b30c28da"
- integrity sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==
-
-lru-cache@^10.0.1, lru-cache@^10.2.0:
- version "10.4.3"
- resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
- integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
-
-make-error@^1.1.1:
- version "1.3.6"
- resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
- integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
-
-make-fetch-happen@^13.0.0:
- version "13.0.1"
- resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz#273ba2f78f45e1f3a6dca91cede87d9fa4821e36"
- integrity sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==
- dependencies:
- "@npmcli/agent" "^2.0.0"
- cacache "^18.0.0"
- http-cache-semantics "^4.1.1"
- is-lambda "^1.0.1"
- minipass "^7.0.2"
- minipass-fetch "^3.0.0"
- minipass-flush "^1.0.5"
- minipass-pipeline "^1.2.4"
- negotiator "^0.6.3"
- proc-log "^4.2.0"
- promise-retry "^2.0.1"
- ssri "^10.0.0"
-
-mime-db@1.52.0:
- version "1.52.0"
- resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
- integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
-
-mime-types@^2.1.12:
- version "2.1.35"
- resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
- integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
- dependencies:
- mime-db "1.52.0"
-
-minimatch@^9.0.4:
- version "9.0.5"
- resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
- integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
- dependencies:
- brace-expansion "^2.0.1"
-
-minipass-collect@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-2.0.1.tgz#1621bc77e12258a12c60d34e2276ec5c20680863"
- integrity sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==
- dependencies:
- minipass "^7.0.3"
-
-minipass-fetch@^3.0.0:
- version "3.0.5"
- resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.5.tgz#f0f97e40580affc4a35cc4a1349f05ae36cb1e4c"
- integrity sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==
- dependencies:
- minipass "^7.0.3"
- minipass-sized "^1.0.3"
- minizlib "^2.1.2"
- optionalDependencies:
- encoding "^0.1.13"
-
-minipass-flush@^1.0.5:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
- integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
- dependencies:
- minipass "^3.0.0"
-
-minipass-pipeline@^1.2.4:
- version "1.2.4"
- resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
- integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
- dependencies:
- minipass "^3.0.0"
-
-minipass-sized@^1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
- integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
- dependencies:
- minipass "^3.0.0"
-
-minipass@^3.0.0:
- version "3.3.6"
- resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
- integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
- dependencies:
- yallist "^4.0.0"
-
-minipass@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
- integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
-
-"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3, minipass@^7.1.2:
- version "7.1.2"
- resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
- integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
-
-minizlib@^2.1.1, minizlib@^2.1.2:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
- integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
- dependencies:
- minipass "^3.0.0"
- yallist "^4.0.0"
-
-mkdirp@^1.0.3:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
- integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
-ms@2.1.2:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
- integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-negotiator@^0.6.3:
- version "0.6.3"
- resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
- integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
-
-node-gyp@^10.0.0:
- version "10.2.0"
- resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-10.2.0.tgz#80101c4aa4f7ab225f13fcc8daaaac4eb1a8dd86"
- integrity sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==
- dependencies:
- env-paths "^2.2.0"
- exponential-backoff "^3.1.1"
- glob "^10.3.10"
- graceful-fs "^4.2.6"
- make-fetch-happen "^13.0.0"
- nopt "^7.0.0"
- proc-log "^4.1.0"
- semver "^7.3.5"
- tar "^6.2.1"
- which "^4.0.0"
-
-nopt@^7.0.0:
- version "7.2.1"
- resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.1.tgz#1cac0eab9b8e97c9093338446eddd40b2c8ca1e7"
- integrity sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==
- dependencies:
- abbrev "^2.0.0"
-
-normalize-package-data@^6.0.0:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-6.0.2.tgz#a7bc22167fe24025412bcff0a9651eb768b03506"
- integrity sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==
- dependencies:
- hosted-git-info "^7.0.0"
- semver "^7.3.5"
- validate-npm-package-license "^3.0.4"
-
-npm-install-checks@^6.0.0:
- version "6.3.0"
- resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-6.3.0.tgz#046552d8920e801fa9f919cad569545d60e826fe"
- integrity sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==
- dependencies:
- semver "^7.1.1"
-
-npm-normalize-package-bin@3.0.1, npm-normalize-package-bin@^3.0.0:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz#25447e32a9a7de1f51362c61a559233b89947832"
- integrity sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==
-
-npm-package-arg@^11.0.0:
- version "11.0.3"
- resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-11.0.3.tgz#dae0c21199a99feca39ee4bfb074df3adac87e2d"
- integrity sha512-sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw==
- dependencies:
- hosted-git-info "^7.0.0"
- proc-log "^4.0.0"
- semver "^7.3.5"
- validate-npm-package-name "^5.0.0"
-
-npm-pick-manifest@^9.0.0:
- version "9.1.0"
- resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-9.1.0.tgz#83562afde52b0b07cb6244361788d319ce7e8636"
- integrity sha512-nkc+3pIIhqHVQr085X9d2JzPzLyjzQS96zbruppqC9aZRm/x8xx6xhI98gHtsfELP2bE+loHq8ZaHFHhe+NauA==
- dependencies:
- npm-install-checks "^6.0.0"
- npm-normalize-package-bin "^3.0.0"
- npm-package-arg "^11.0.0"
- semver "^7.3.5"
-
-once@^1.4.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
- integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
- dependencies:
- wrappy "1"
-
-p-map@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
- integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
- dependencies:
- aggregate-error "^3.0.0"
-
-package-json-from-dist@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz#e501cd3094b278495eb4258d4c9f6d5ac3019f00"
- integrity sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==
-
-path-key@^3.1.0:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
- integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
-path-parse@^1.0.7:
- version "1.0.7"
- resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
- integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
-
-path-scurry@^1.11.1:
- version "1.11.1"
- resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
- integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
- dependencies:
- lru-cache "^10.2.0"
- minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
-
-proc-log@^4.0.0, proc-log@^4.1.0, proc-log@^4.2.0:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-4.2.0.tgz#b6f461e4026e75fdfe228b265e9f7a00779d7034"
- integrity sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==
-
-promise-inflight@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
- integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
-
-promise-retry@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
- integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
- dependencies:
- err-code "^2.0.2"
- retry "^0.12.0"
-
-proxy-from-env@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
- integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
-
-read-cmd-shim@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz#640a08b473a49043e394ae0c7a34dd822c73b9bb"
- integrity sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q==
-
-require-directory@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
- integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
-
-resolve@1.22.8:
- version "1.22.8"
- resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
- integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
- dependencies:
- is-core-module "^2.13.0"
- path-parse "^1.0.7"
- supports-preserve-symlinks-flag "^1.0.0"
-
-retry@^0.12.0:
- version "0.12.0"
- resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
- integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
-
-"safer-buffer@>= 2.1.2 < 3.0.0":
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
- integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-semver@^7.1.1, semver@^7.3.5, semver@^7.5.3:
- version "7.6.3"
- resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
- integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
-
-shebang-command@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
- integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
- dependencies:
- shebang-regex "^3.0.0"
-
-shebang-regex@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
- integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
-signal-exit@^4.0.1:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
- integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
-
-simple-git@^3.25.0:
- version "3.25.0"
- resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-3.25.0.tgz#3666e76d6831f0583dc380645945b97e0ac4aab6"
- integrity sha512-KIY5sBnzc4yEcJXW7Tdv4viEz8KyG+nU0hay+DWZasvdFOYKeUZ6Xc25LUHHjw0tinPT7O1eY6pzX7pRT1K8rw==
- dependencies:
- "@kwsites/file-exists" "^1.1.1"
- "@kwsites/promise-deferred" "^1.1.1"
- debug "^4.3.5"
-
-smart-buffer@^4.2.0:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
- integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
-
-socks-proxy-agent@^8.0.3:
- version "8.0.4"
- resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz#9071dca17af95f483300316f4b063578fa0db08c"
- integrity sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==
- dependencies:
- agent-base "^7.1.1"
- debug "^4.3.4"
- socks "^2.8.3"
-
-socks@^2.8.3:
- version "2.8.3"
- resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.3.tgz#1ebd0f09c52ba95a09750afe3f3f9f724a800cb5"
- integrity sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==
- dependencies:
- ip-address "^9.0.5"
- smart-buffer "^4.2.0"
-
-spdx-correct@^3.0.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
- integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==
- dependencies:
- spdx-expression-parse "^3.0.0"
- spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
- version "2.5.0"
- resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz#5d607d27fc806f66d7b64a766650fa890f04ed66"
- integrity sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==
-
-spdx-expression-parse@^3.0.0:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
- integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
- dependencies:
- spdx-exceptions "^2.1.0"
- spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
- version "3.0.20"
- resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz#e44ed19ed318dd1e5888f93325cee800f0f51b89"
- integrity sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==
-
-sprintf-js@^1.1.3:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a"
- integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==
-
-ssri@^10.0.0:
- version "10.0.6"
- resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.6.tgz#a8aade2de60ba2bce8688e3fa349bad05c7dc1e5"
- integrity sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==
- dependencies:
- minipass "^7.0.3"
-
-"string-width-cjs@npm:string-width@^4.2.0":
- version "4.2.3"
- resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
- integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
- dependencies:
- emoji-regex "^8.0.0"
- is-fullwidth-code-point "^3.0.0"
- strip-ansi "^6.0.1"
-
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
- version "4.2.3"
- resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
- integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
- dependencies:
- emoji-regex "^8.0.0"
- is-fullwidth-code-point "^3.0.0"
- strip-ansi "^6.0.1"
-
-string-width@^5.0.1, string-width@^5.1.2:
- version "5.1.2"
- resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
- integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
- dependencies:
- eastasianwidth "^0.2.0"
- emoji-regex "^9.2.2"
- strip-ansi "^7.0.1"
-
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
- version "6.0.1"
- resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
- integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
- dependencies:
- ansi-regex "^5.0.1"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
- version "6.0.1"
- resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
- integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
- dependencies:
- ansi-regex "^5.0.1"
-
-strip-ansi@^7.0.1:
- version "7.1.0"
- resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
- integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
- dependencies:
- ansi-regex "^6.0.1"
-
-supports-preserve-symlinks-flag@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
- integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
-
-tar@^6.1.11, tar@^6.2.1:
- version "6.2.1"
- resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
- integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
- dependencies:
- chownr "^2.0.0"
- fs-minipass "^2.0.0"
- minipass "^5.0.0"
- minizlib "^2.1.1"
- mkdirp "^1.0.3"
- yallist "^4.0.0"
-
-ts-node@^10.5.0:
- version "10.9.2"
- resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
- integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==
- dependencies:
- "@cspotcode/source-map-support" "^0.8.0"
- "@tsconfig/node10" "^1.0.7"
- "@tsconfig/node12" "^1.0.7"
- "@tsconfig/node14" "^1.0.0"
- "@tsconfig/node16" "^1.0.2"
- acorn "^8.4.1"
- acorn-walk "^8.1.1"
- arg "^4.1.0"
- create-require "^1.1.0"
- diff "^4.0.1"
- make-error "^1.1.1"
- v8-compile-cache-lib "^3.0.1"
- yn "3.1.1"
-
-tunnel@^0.0.6:
- version "0.0.6"
- resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
- integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
-
-typescript@~5.4.5:
- version "5.4.5"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
- integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
-
-undici-types@~6.19.2:
- version "6.19.8"
- resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
- integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
-
-undici@^5.25.4:
- version "5.28.4"
- resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.4.tgz#6b280408edb6a1a604a9b20340f45b422e373068"
- integrity sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==
- dependencies:
- "@fastify/busboy" "^2.0.0"
-
-unique-filename@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea"
- integrity sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==
- dependencies:
- unique-slug "^4.0.0"
-
-unique-slug@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3"
- integrity sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==
- dependencies:
- imurmurhash "^0.1.4"
-
-universal-user-agent@^6.0.0:
- version "6.0.1"
- resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.1.tgz#15f20f55da3c930c57bddbf1734c6654d5fd35aa"
- integrity sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==
-
-uuid@^8.3.2:
- version "8.3.2"
- resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
- integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
-
-v8-compile-cache-lib@^3.0.1:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
- integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
-
-validate-npm-package-license@^3.0.4:
- version "3.0.4"
- resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
- integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
- dependencies:
- spdx-correct "^3.0.0"
- spdx-expression-parse "^3.0.0"
-
-validate-npm-package-name@^5.0.0:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz#a316573e9b49f3ccd90dbb6eb52b3f06c6d604e8"
- integrity sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==
-
-which@^2.0.1:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
- integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
- dependencies:
- isexe "^2.0.0"
-
-which@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/which/-/which-4.0.0.tgz#cd60b5e74503a3fbcfbf6cd6b4138a8bae644c1a"
- integrity sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==
- dependencies:
- isexe "^3.1.1"
-
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
- integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
- dependencies:
- ansi-styles "^4.0.0"
- string-width "^4.1.0"
- strip-ansi "^6.0.0"
-
-wrap-ansi@^7.0.0:
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
- integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
- dependencies:
- ansi-styles "^4.0.0"
- string-width "^4.1.0"
- strip-ansi "^6.0.0"
-
-wrap-ansi@^8.1.0:
- version "8.1.0"
- resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
- integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
- dependencies:
- ansi-styles "^6.1.0"
- string-width "^5.0.1"
- strip-ansi "^7.0.1"
-
-wrappy@1:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
- integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
-
-write-file-atomic@^5.0.0:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-5.0.1.tgz#68df4717c55c6fa4281a7860b4c2ba0a6d2b11e7"
- integrity sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==
- dependencies:
- imurmurhash "^0.1.4"
- signal-exit "^4.0.1"
-
-y18n@^5.0.5:
- version "5.0.8"
- resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
- integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
-
-yallist@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
- integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-
-yargs-parser@^21.1.1:
- version "21.1.1"
- resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
- integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
-
-yargs@17.7.2:
- version "17.7.2"
- resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
- integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
- dependencies:
- cliui "^8.0.1"
- escalade "^3.1.1"
- get-caller-file "^2.0.5"
- require-directory "^2.1.1"
- string-width "^4.2.3"
- y18n "^5.0.5"
- yargs-parser "^21.1.1"
-
-yn@3.1.1:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
- integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
diff --git a/.github/workflows/add-release-label.yml b/.github/workflows/add-release-label.yml
index a5a4daa7103..b56d691ae99 100644
--- a/.github/workflows/add-release-label.yml
+++ b/.github/workflows/add-release-label.yml
@@ -21,17 +21,16 @@ jobs:
uses: actions/setup-node@v3
with:
node-version-file: '.nvmrc'
+ cache: yarn
- name: Install dependencies
run: yarn --immutable
- working-directory: '.github/scripts'
- name: Get the next semver version
id: get-next-semver-version
env:
FORCE_NEXT_SEMVER_VERSION: ${{ vars.FORCE_NEXT_SEMVER_VERSION }}
run: ./scripts/get-next-semver-version.sh "$FORCE_NEXT_SEMVER_VERSION"
- working-directory: '.github/scripts'
- name: Add release label to PR and linked issues
id: add-release-label-to-pr-and-linked-issues
@@ -39,4 +38,3 @@ jobs:
RELEASE_LABEL_TOKEN: ${{ secrets.RELEASE_LABEL_TOKEN }}
NEXT_SEMVER_VERSION: ${{ env.NEXT_SEMVER_VERSION }}
run: yarn run add-release-label-to-pr-and-linked-issues
- working-directory: '.github/scripts'
diff --git a/.github/workflows/check-pr-labels.yml b/.github/workflows/check-pr-labels.yml
index e17447c2711..6e0bf98762a 100644
--- a/.github/workflows/check-pr-labels.yml
+++ b/.github/workflows/check-pr-labels.yml
@@ -26,14 +26,13 @@ jobs:
uses: actions/setup-node@v3
with:
node-version-file: '.nvmrc'
+ cache: yarn
- name: Install dependencies
run: yarn --immutable
- working-directory: '.github/scripts'
- name: Check PR has required labels
id: check-pr-has-required-labels
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: yarn run check-pr-has-required-labels
- working-directory: '.github/scripts'
diff --git a/.github/workflows/check-template-and-add-labels.yml b/.github/workflows/check-template-and-add-labels.yml
index a01f1b6d5b7..e5311b70d22 100644
--- a/.github/workflows/check-template-and-add-labels.yml
+++ b/.github/workflows/check-template-and-add-labels.yml
@@ -19,14 +19,13 @@ jobs:
uses: actions/setup-node@v3
with:
node-version-file: '.nvmrc'
+ cache: yarn
- name: Install dependencies
run: yarn --immutable
- working-directory: '.github/scripts'
- name: Check template and add labels
id: check-template-and-add-labels
env:
LABEL_TOKEN: ${{ secrets.LABEL_TOKEN }}
run: npm run check-template-and-add-labels
- working-directory: '.github/scripts'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 64bd5bea831..f13a32ae47f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,22 +5,16 @@ on:
pull_request:
merge_group:
types: [checks_requested]
-
+
jobs:
- check-diff:
- runs-on: macos-latest
+ setup:
+ runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version-file: '.nvmrc'
cache: yarn
- - uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 #v1
- with:
- ruby-version: '3.1.5'
- bundler-cache: true
- env:
- BUNDLE_GEMFILE: ios/Gemfile
- name: Determine whether the current PR is a draft
id: set-is-draft
if: github.event_name == 'pull_request' && github.event.pull_request.number
@@ -33,7 +27,7 @@ jobs:
run: printf '%s\n\n%s' '@metamask:registry=https://npm.pkg.github.com' "//npm.pkg.github.com/:_authToken=${PACKAGE_READ_TOKEN}" > .npmrc
env:
PACKAGE_READ_TOKEN: ${{ secrets.PACKAGE_READ_TOKEN }}
- - run: yarn setup
+ - run: yarn setup --node
- name: Require clean working directory
shell: bash
run: |
@@ -45,6 +39,7 @@ jobs:
fi
dedupe:
runs-on: ubuntu-20.04
+ needs: setup
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
@@ -63,6 +58,7 @@ jobs:
fi
scripts:
runs-on: ubuntu-20.04
+ needs: setup
strategy:
matrix:
scripts:
@@ -90,6 +86,7 @@ jobs:
fi
unit-tests:
runs-on: ubuntu-20.04
+ needs: setup
strategy:
matrix:
shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
@@ -159,6 +156,7 @@ jobs:
js-bundle-size-check:
runs-on: ubuntu-20.04
+ needs: setup
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
@@ -222,10 +220,6 @@ jobs:
uses: actions/checkout@v3
- name: SonarCloud Quality Gate Status
id: sonar-status
- env:
- REPO: ${{ github.repository }}
- ISSUE_NUMBER: ${{ github.event.issue.number || github.event.pull_request.number }}
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
# Skip step if event is a PR
if [[ "${{ github.event_name }}" != "pull_request" ]]; then
@@ -233,40 +227,31 @@ jobs:
exit 0
fi
- # Bypass step if skip-sonar-cloud label is found
- LABEL=$(curl -s -H "Authorization: token $GITHUB_TOKEN" \
- "https://api.github.com/repos/$REPO/issues/$ISSUE_NUMBER/labels" | \
- jq -r '.[] | select(.name=="skip-sonar-cloud") | .name')
+ sleep 30
- if [[ "$LABEL" == "skip-sonar-cloud" ]]; then
- echo "skip-sonar-cloud label found. Skipping SonarCloud Quality Gate check."
- else
- sleep 30
-
- PROJECT_KEY="metamask-mobile"
- PR_NUMBER="${{ github.event.pull_request.number }}"
- SONAR_TOKEN="${{ secrets.SONAR_TOKEN }}"
+ PROJECT_KEY="metamask-mobile"
+ PR_NUMBER="${{ github.event.pull_request.number }}"
+ SONAR_TOKEN="${{ secrets.SONAR_TOKEN }}"
- if [ -z "$PR_NUMBER" ]; then
- echo "No pull request number found. Failing the check."
- exit 1
- fi
+ if [ -z "$PR_NUMBER" ]; then
+ echo "No pull request number found. Failing the check."
+ exit 1
+ fi
- RESPONSE=$(curl -s -u "$SONAR_TOKEN:" \
- "https://sonarcloud.io/api/qualitygates/project_status?projectKey=$PROJECT_KEY&pullRequest=$PR_NUMBER")
- echo "SonarCloud API Response: $RESPONSE"
+ RESPONSE=$(curl -s -u "$SONAR_TOKEN:" \
+ "https://sonarcloud.io/api/qualitygates/project_status?projectKey=$PROJECT_KEY&pullRequest=$PR_NUMBER")
+ echo "SonarCloud API Response: $RESPONSE"
- STATUS=$(echo "$RESPONSE" | jq -r '.projectStatus.status')
+ STATUS=$(echo "$RESPONSE" | jq -r '.projectStatus.status')
- if [[ "$STATUS" == "ERROR" ]]; then
- echo "Quality Gate failed."
- exit 1
- elif [[ "$STATUS" == "OK" ]]; then
- echo "Quality Gate passed."
- else
- echo "Could not determine Quality Gate status."
- exit 1
- fi
+ if [[ "$STATUS" == "ERROR" ]]; then
+ echo "Quality Gate failed."
+ exit 1
+ elif [[ "$STATUS" == "OK" ]]; then
+ echo "Quality Gate passed."
+ else
+ echo "Could not determine Quality Gate status."
+ exit 1
fi
check-workflows:
name: Check workflows
@@ -285,11 +270,12 @@ jobs:
runs-on: ubuntu-20.04
needs:
[
- check-diff,
+ setup,
dedupe,
scripts,
unit-tests,
check-workflows,
+ sonar-cloud,
js-bundle-size-check,
sonar-cloud-quality-gate-status,
]
diff --git a/.github/workflows/close-bug-report.yml b/.github/workflows/close-bug-report.yml
index a80004cae14..981824ed300 100644
--- a/.github/workflows/close-bug-report.yml
+++ b/.github/workflows/close-bug-report.yml
@@ -21,10 +21,10 @@ jobs:
uses: actions/setup-node@v3
with:
node-version-file: '.nvmrc'
+ cache: yarn
- name: Install dependencies
run: yarn --immutable
- working-directory: '.github/scripts'
- name: Close release bug report issue
id: close-release-bug-report-issue
@@ -32,4 +32,3 @@ jobs:
BUG_REPORT_REPO: mobile-planning
BUG_REPORT_TOKEN: ${{ secrets.BUG_REPORT_TOKEN }}
run: yarn run close-release-bug-report-issue
- working-directory: '.github/scripts'
diff --git a/.github/workflows/crowdin_action.yml b/.github/workflows/crowdin_action.yml
index eba1ac69154..2582db7e5a7 100644
--- a/.github/workflows/crowdin_action.yml
+++ b/.github/workflows/crowdin_action.yml
@@ -10,6 +10,8 @@ on:
- main
schedule:
- cron: "0 */12 * * *"
+ merge_group:
+ types: [checks_requested]
jobs:
synchronize-with-crowdin:
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a95001cb1c6..f577c5ba755 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -4,20 +4,21 @@ on:
branches: main
pull_request:
+
jobs:
docker:
runs-on: ubuntu-latest
steps:
- name: Set up QEMU
- uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3
+ uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3
- name: Set up Docker Buildx
- uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3
+ uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3
- uses: actions/checkout@v3
- name: Build and load
- uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5
+ uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5
with:
context: .
file: scripts/docker/Dockerfile
diff --git a/.github/workflows/fitness-functions.yml b/.github/workflows/fitness-functions.yml
index 6e621537271..454b9ce8bc4 100644
--- a/.github/workflows/fitness-functions.yml
+++ b/.github/workflows/fitness-functions.yml
@@ -18,10 +18,10 @@ jobs:
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
+ cache: yarn
- name: Install dependencies
run: yarn --immutable
- working-directory: '.github/scripts'
- name: Run fitness functions
env:
@@ -33,4 +33,3 @@ jobs:
# then saved to a file called "diff".
git diff "$(git merge-base "origin/$BASE_REF" HEAD)" HEAD -- . > ./diff
yarn run fitness-functions -- "ci" "./diff"
- working-directory: '.github/scripts'
diff --git a/.github/workflows/run-bitrise-e2e-check.yml b/.github/workflows/run-bitrise-e2e-check.yml
index ac1016e9d86..23274a35f5e 100644
--- a/.github/workflows/run-bitrise-e2e-check.yml
+++ b/.github/workflows/run-bitrise-e2e-check.yml
@@ -43,10 +43,10 @@ jobs:
uses: actions/setup-node@v3
with:
node-version-file: '.nvmrc'
+ cache: yarn
- name: Install dependencies
run: yarn --immutable
- working-directory: '.github/scripts'
- name: Check Bitrise E2E Status
env:
@@ -56,4 +56,3 @@ jobs:
# The status check created under this workflow may be bucketed under another check suite in Github actions. This is a result of workflows with the same triggers.
# For example, the status check may show as `CLA Signature Bot / Bitrise E2E Status`. This is a bug on Github's UI. https://github.com/orgs/community/discussions/24616
run: yarn run run-bitrise-e2e-check
- working-directory: '.github/scripts'
diff --git a/.js.env.example b/.js.env.example
index 68e8316f034..768f29a7f82 100644
--- a/.js.env.example
+++ b/.js.env.example
@@ -92,5 +92,3 @@ export MM_ENABLE_SETTINGS_PAGE_DEV_OPTIONS="true"
# Multichain Feature flag
export MULTICHAIN_V1=""
-#Multichain feature flag specific to UI changes
-export MM_MULTICHAIN_V1_ENABLED=""
diff --git a/.storybook/main.js b/.storybook/main.js
index fd51e44c137..64a3f3cf602 100644
--- a/.storybook/main.js
+++ b/.storybook/main.js
@@ -3,7 +3,6 @@ module.exports = {
'../app/component-library/components/**/*.stories.?(ts|tsx|js|jsx)',
'../app/component-library/base-components/**/*.stories.?(ts|tsx|js|jsx)',
'../app/component-library/components-temp/TagColored/**/*.stories.?(ts|tsx|js|jsx)',
- '../app/component-library/components-temp/KeyValueRow/**/*.stories.?(ts|tsx|js|jsx)',
],
addons: ['@storybook/addon-ondevice-controls'],
framework: '@storybook/react-native',
diff --git a/.storybook/storybook.requires.js b/.storybook/storybook.requires.js
index 3b26602e64d..ae2e8f2d55b 100644
--- a/.storybook/storybook.requires.js
+++ b/.storybook/storybook.requires.js
@@ -30,13 +30,6 @@ global.STORIES = [
importPathMatcher:
"^\\.[\\\\/](?:app\\/component-library\\/components-temp\\/TagColored(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.(?:ts|tsx|js|jsx)?)$",
},
- {
- titlePrefix: "",
- directory: "./app/component-library/components-temp/KeyValueRow",
- files: "**/*.stories.?(ts|tsx|js|jsx)",
- importPathMatcher:
- "^\\.[\\\\/](?:app\\/component-library\\/components-temp\\/KeyValueRow(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.(?:ts|tsx|js|jsx)?)$",
- },
];
import "@storybook/addon-ondevice-controls/register";
@@ -122,7 +115,8 @@ const getStories = () => {
"./app/component-library/components/Toast/Toast.stories.tsx": require("../app/component-library/components/Toast/Toast.stories.tsx"),
"./app/component-library/base-components/TagBase/TagBase.stories.tsx": require("../app/component-library/base-components/TagBase/TagBase.stories.tsx"),
"./app/component-library/components-temp/TagColored/TagColored.stories.tsx": require("../app/component-library/components-temp/TagColored/TagColored.stories.tsx"),
- "./app/component-library/components-temp/KeyValueRow/KeyValueRow.stories.tsx": require("../app/component-library/components-temp/KeyValueRow/KeyValueRow.stories.tsx"),
+ "./app/components/Views/AssetDetails/AssetDetailsActions/AssetDetailsActions.stories.tsx": require("../app/components/Views/AssetDetails/AssetDetailsActions/AssetDetailsActions.stories.tsx"),
+
};
};
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b50b2835a3..97b9b7095f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,96 @@
## Current Main Branch
+## 7.32.0 - Sep 19, 2024
+
+### Added
+
+- [#10294](https://github.com/MetaMask/metamask-mobile/pull/10294): feat: create redux slice for featureFlags (#10294)
+- [#11314](https://github.com/MetaMask/metamask-mobile/pull/11314): feat: reject connection properly (#11314)
+- [#11132](https://github.com/MetaMask/metamask-mobile/pull/11132): feat: Add performance tracing infrastructure (#11132)
+- [#10061](https://github.com/MetaMask/metamask-mobile/pull/10061): feat: new receive flow (#10061)
+- [#11174](https://github.com/MetaMask/metamask-mobile/pull/11174): feat(2796): behind feature flag permission settings multichain 2of2 (#11174)
+- [#11019](https://github.com/MetaMask/metamask-mobile/pull/11019): feat(2793): mocked UI screen displaying multichain dapp permission summary 2of2 (#11019)
+- [#10988](https://github.com/MetaMask/metamask-mobile/pull/10988): feat(2808): add a mocked UI checkbox list that will later allow adding the ability to edit network permission (#10988)
+- [#11168](https://github.com/MetaMask/metamask-mobile/pull/11168): feat: add pooled staking input flow screen (#11168)
+- [#10964](https://github.com/MetaMask/metamask-mobile/pull/10964): feat: build your earnings component stub in eth token details (#10964)
+- [#11051](https://github.com/MetaMask/metamask-mobile/pull/11051): feat: add brand evo font files (#11051)
+- [#11285](https://github.com/MetaMask/metamask-mobile/pull/11285): feat: notifications add analytics (#11285)
+- [#10755](https://github.com/MetaMask/metamask-mobile/pull/10755): feat: ledger account selection screen add hd options to sync with extension (#10755)
+- [#11195](https://github.com/MetaMask/metamask-mobile/pull/11195): feat: add AppState dependency to load notifications (#11195)
+- [#11175](https://github.com/MetaMask/metamask-mobile/pull/11175): feat: add product announcements toggle (#11175)
+
+### Changed
+- [#11148](https://github.com/MetaMask/metamask-mobile/pull/11148): chore: remove animation and add new splash screen (#11148)
+- [#11306](https://github.com/MetaMask/metamask-mobile/pull/11306): chore: update @sentry/react-native to version 5.33.0 (#11306)
+- [#11144](https://github.com/MetaMask/metamask-mobile/pull/11144): test: E2E Mocking Setup For Detox Tests (#11144)
+- [#11212](https://github.com/MetaMask/metamask-mobile/pull/11212): chore: Update CI workflow triggers to support release branches (#11212)
+- [#11243](https://github.com/MetaMask/metamask-mobile/pull/11243): chore(js-ts): Convert ModalNavbarTitle to TypeScript (#11243)
+- [#11213](https://github.com/MetaMask/metamask-mobile/pull/11213): test: Appium separate and optimize app launch time measurements (#11213)
+- [#11264](https://github.com/MetaMask/metamask-mobile/pull/11264): chore: remove triggers for actions not needed during the merge-queue CI (#11264)
+- [#11222](https://github.com/MetaMask/metamask-mobile/pull/11222): chore: add bitrise document link to the bitrise failed comment (#11222)
+- [#11145](https://github.com/MetaMask/metamask-mobile/pull/11145): chore: update performance for new allocation (#11145)
+- [#11184](https://github.com/MetaMask/metamask-mobile/pull/11184): test: remove notifications launch arg in E2E (#11184)
+- [#11186](https://github.com/MetaMask/metamask-mobile/pull/11186): ci: prevent detox E2E lock failure (#11186)
+- [#11141](https://github.com/MetaMask/metamask-mobile/pull/11141): chore: update express for all the packages (#11141)
+- [#11124](https://github.com/MetaMask/metamask-mobile/pull/11124): docs: Update Appium documentation (#11124)
+- [#10865](https://github.com/MetaMask/metamask-mobile/pull/10865): chore: update eslint v^8.44 (#10865)
+- [#11096](https://github.com/MetaMask/metamask-mobile/pull/11096): test: detox black list gas api endpoint (#11096)
+- [#11246](https://github.com/MetaMask/metamask-mobile/pull/11246): chore: Remove `eth-sign` (#11246)
+- [#11220](https://github.com/MetaMask/metamask-mobile/pull/11220): chore: Update package @blockaid/ppom_release to version 1.5.3 (#11220)
+- [#11244](https://github.com/MetaMask/metamask-mobile/pull/11244): chore(js-ts): Convert useInterval.js to TypeScript (#11244)
+- [#11089](https://github.com/MetaMask/metamask-mobile/pull/11089): chore: add staking team to codeowners file (#11089)
+- [#11049](https://github.com/MetaMask/metamask-mobile/pull/11049): chore: update balance design (#11049)
+- [#11011](https://github.com/MetaMask/metamask-mobile/pull/11011): chore: Capture currency change in MetaMetrics (#11011)
+- [#10468](https://github.com/MetaMask/metamask-mobile/pull/10468): chore: Capture custom rpc url in `trackEvent` (#10468)
+- [#11207](https://github.com/MetaMask/metamask-mobile/pull/11207): chore(deps): Bump `@metamask/base-controller` from `^6.0.0` to `^7.0.0` (#11207)
+- [#11235](https://github.com/MetaMask/metamask-mobile/pull/11235): ci: avoid running release pipeline on every commit to the release branch (#11235)
+- [#11094](https://github.com/MetaMask/metamask-mobile/pull/11094): chore: chore/7.31.0-Changelog (#11094)
+- [#10788](https://github.com/MetaMask/metamask-mobile/pull/10788): chore: Add `@metamask/selected-network-controller` & integrate (#10788)
+- [#11122](https://github.com/MetaMask/metamask-mobile/pull/11122): test: e2e for auto-lock (#11122)
+- [#11143](https://github.com/MetaMask/metamask-mobile/pull/11143): chore: bump react native webview to 14.0.3 version (#11143)
+- [#11284](https://github.com/MetaMask/metamask-mobile/pull/11284): chore: add notifications state awareness inapp badge (#11284)
+- [#11209](https://github.com/MetaMask/metamask-mobile/pull/11209): chore(runway): cherry-pick fix: freeze during swap with approval (#11209)
+- [#11157](https://github.com/MetaMask/metamask-mobile/pull/11157): chore(runway): cherry-pick chore: bump send for all the packages (#11157)
+- [#11082](https://github.com/MetaMask/metamask-mobile/pull/11082): chore: bump network controller 20.0.0 (#11082)
+- [#11095](https://github.com/MetaMask/metamask-mobile/pull/11095): chore(runway): cherry-pick fix: Intermittent Display Issue of Fiat Currency on Main Wallet View (#11095)
+- [#11181](https://github.com/MetaMask/metamask-mobile/pull/11181): chore(runway): cherry-pick fix: fix check token balance is zero (#11181)
+- [#11208](https://github.com/MetaMask/metamask-mobile/pull/11208): chore(runway): cherry-pick chore: update performance for new allocation (#11208)
+- [#10821](https://github.com/MetaMask/metamask-mobile/pull/10821): chore(deps): bump `accounts-controller` to v18.1.0 and `keyring-api` to v8.1.0 (#10821)
+
+### Fixed
+- [#11117](https://github.com/MetaMask/metamask-mobile/pull/11117): fix: add feat flag (#11117)
+- [#11084](https://github.com/MetaMask/metamask-mobile/pull/11084): fix: locks api spec version for api spec tests (#11084)
+- [#11310](https://github.com/MetaMask/metamask-mobile/pull/11310): fix: quick fix on feature flag & notification state (#11310)
+- [#11200](https://github.com/MetaMask/metamask-mobile/pull/11200): fix: add feature flag on profile sync (#11200)
+- [#11302](https://github.com/MetaMask/metamask-mobile/pull/11302): fix: cp & resolve merge conflict (#11302)
+- [#11130](https://github.com/MetaMask/metamask-mobile/pull/11130): fix(action): add a workaround for known bots (#11130)
+- [#11173](https://github.com/MetaMask/metamask-mobile/pull/11173): fix: dset version (#11173)
+- [#10899](https://github.com/MetaMask/metamask-mobile/pull/10899): fix: Android crash when svgs use the " html entity (#10899)
+- [#11126](https://github.com/MetaMask/metamask-mobile/pull/11126): fix: Skip sonar cloud gate in step instead (#11126)
+- [#11121](https://github.com/MetaMask/metamask-mobile/pull/11121): fix: Add new job to verify ""All jobs pass"" job for required PR check (#11121)
+- [#11266](https://github.com/MetaMask/metamask-mobile/pull/11266): fix: notification permission flow (#11266)
+- [#11252](https://github.com/MetaMask/metamask-mobile/pull/11252): fix: notification permission request message (#11252)
+- [#11155](https://github.com/MetaMask/metamask-mobile/pull/11155): fix: android crashing on date formating Intl usage. (#11155)
+- [#11137](https://github.com/MetaMask/metamask-mobile/pull/11137): fix: notifications bugs (#11137)
+- [#11110](https://github.com/MetaMask/metamask-mobile/pull/11110): fix: accounts notifications switch (#11110)
+- [#11146](https://github.com/MetaMask/metamask-mobile/pull/11146): fix: update nativesdk with improved concurrency handling (#11146)
+- [#11165](https://github.com/MetaMask/metamask-mobile/pull/11165): fix: freeze during swap with approval (#11165)
+- [#11161](https://github.com/MetaMask/metamask-mobile/pull/11161): fix: blockaid loader on confirmation pages (#11161)
+- [#10989](https://github.com/MetaMask/metamask-mobile/pull/10989): fix: closing of gas info tooltip (#10989)
+- [#10348](https://github.com/MetaMask/metamask-mobile/pull/10348): fix: confirmations UI adjustments (#10348)
+- [#10842](https://github.com/MetaMask/metamask-mobile/pull/10842): fix: app crash due to minimal input must be string error (#10842)
+- [#11112](https://github.com/MetaMask/metamask-mobile/pull/11112): fix: update token details monetization button (#11112)
+- [#11172](https://github.com/MetaMask/metamask-mobile/pull/11172): fix: fix check token balance is zero (#11172)
+- [#11087](https://github.com/MetaMask/metamask-mobile/pull/11087): fix: Intermittent Display Issue of Fiat Currency on Main Wallet View (#11087)
+- [#11176](https://github.com/MetaMask/metamask-mobile/pull/11176): fix: switch from bundled to url EE (#11176)
+- [#11281](https://github.com/MetaMask/metamask-mobile/pull/11281): fix: Fix the styling issue of link in SearchingForDeviceStep component (#11281)
+- [#11265](https://github.com/MetaMask/metamask-mobile/pull/11265): fix: notification account syncing (#11265)
+- [#11218](https://github.com/MetaMask/metamask-mobile/pull/11218): fix: close icon on notifications list screen (#11218)
+- [#11193](https://github.com/MetaMask/metamask-mobile/pull/11193): fix: ItemMenu crash using dayjs (#11193)
+- [#11098](https://github.com/MetaMask/metamask-mobile/pull/11098): fix: badge count and ui polishing (#11098)
+
+
## 7.31.0 - Sep 6, 2024
### Added
- [#10747](https://github.com/MetaMask/metamask-mobile/pull/10747): feat: 2805 grant permission to network with missmatching rpc url (#10747)
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 00000000000..3c02108f3ce
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+# Recommended to use http://rbenv.org/ to install and use this version
+ruby '>= 3.1.5'
+
+# Allow minor version updates up to but excluding 2.0.0
+gem 'cocoapods', '~> 1.12'
+
+# Allow all version updates up to but excluding 7.1.0
+gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
diff --git a/ios/Gemfile.lock b/Gemfile.lock
similarity index 100%
rename from ios/Gemfile.lock
rename to Gemfile.lock
diff --git a/README.md b/README.md
index 2c4a6de0445..64eff4aa1df 100644
--- a/README.md
+++ b/README.md
@@ -41,20 +41,15 @@ cd metamask-mobile
**Firebase Messaging Setup**
-Before running the app, keep in mind that MetaMask uses FCM (Firebase Cloud Message) to empower communications. Based on this, as an external contributor you would preferably need to provide your own FREE Firebase project config file with a matching client for package name `io.metamask`, and update your `google-services.json` file in the `android/app` directory as well your `.env` files (`.ios.env`, `.js.env`, `.android.env`), adding `GOOGLE_SERVICES_B64` variable depending on the environment you are running the app (ios/android).
+Before running the app, keep in mind that MetaMask uses FCM (Firebase Cloud Message) to empower communications. Based on this, would be preferable that you provide your own Firebase project config file and update your `google-services.json` file in the `android/app` directory as well your .env files (ios.env, js.env, android.env), adding GOOGLE_SERVICES_B64 variable depending on the environment you are running the app (ios/android).
-The value you should provide to `GOOGLE_SERVICES_B64` is the base64 encoded version of your Firebase project config file, which can be generated as follows:
+ATTENTION: In case you don't provide your own Firebase project config file, you can make usage of a mock file at `android/app/google-services-example.json`, following the steps below from the root of the project:
```bash
base64 -i ./android/app/google-services-example.json
```
-Copy the result to your clipboard and paste it in the `GOOGLE_SERVICES_B64` variable in the `.env` file you are running the app.
-
-> [!CAUTION]
-> In case you don't provide your own Firebase project config file, you will face the error `No matching client found for package name 'io.metamask'`.
-
-You can make usage of a mock file at `android/app/google-services-example.json`, following the same steps above from the root of the project.
+Copy the result to your clipboard and paste it in the GOOGLE_SERVICES_B64 variable in the .env file you are running the app.
In case of any doubt, please follow the instructions in the link below to get your Firebase project config file.
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 2363b3c882e..c103d97dbf1 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -173,8 +173,8 @@ android {
applicationId "io.metamask"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 1432
- versionName "7.31.0"
+ versionCode 1441
+ versionName "7.32.0"
testBuildType System.getProperty('testBuildType', 'debug')
missingDimensionStrategy 'react-native-camera', 'general'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/android/app/google-services-example.json b/android/app/google-services-example.json
index f7765f0ad2a..56d9bd48e3c 100644
--- a/android/app/google-services-example.json
+++ b/android/app/google-services-example.json
@@ -7,20 +7,15 @@
},
"client": [
{
- "api_key": [
- {
- "current_key": ""
- }
- ],
"client_info": {
"mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063",
- "client_id": "android:io.metamask",
+ "client_id": "android:com.google.samples.quickstart.admobexample",
"client_type": 1,
"android_client_info": {
- "package_name": "io.metamask",
+ "package_name": "com.google.samples.quickstart.admobexample",
"certificate_hash": []
}
- }
+ },
}
],
"configuration_version": "1"
diff --git a/app/actions/onboarding/index.js b/app/actions/onboarding/index.js
new file mode 100644
index 00000000000..244cac54e16
--- /dev/null
+++ b/app/actions/onboarding/index.js
@@ -0,0 +1,20 @@
+/**
+ * Saves an onboarding analytics event in state
+ *
+ * @param {object} event - Event object
+ */
+export function saveOnboardingEvent(event) {
+ return {
+ type: 'SAVE_EVENT',
+ event,
+ };
+}
+
+/**
+ * Erases any event stored in state
+ */
+export function clearOnboardingEvents() {
+ return {
+ type: 'CLEAR_EVENTS',
+ };
+}
diff --git a/app/actions/onboarding/index.ts b/app/actions/onboarding/index.ts
deleted file mode 100644
index 9866cf8d17b..00000000000
--- a/app/actions/onboarding/index.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { IMetaMetricsEvent } from '../../core/Analytics';
-
-export const SAVE_EVENT = 'SAVE_EVENT';
-export const CLEAR_EVENTS = 'CLEAR_EVENTS';
-
-interface SaveEventAction {
- type: typeof SAVE_EVENT;
- event: [IMetaMetricsEvent];
-}
-
-interface ClearEventsAction {
- type: typeof CLEAR_EVENTS;
-}
-
-export type OnboardingActionTypes = SaveEventAction | ClearEventsAction;
-
-export function saveOnboardingEvent(eventArgs: [IMetaMetricsEvent]): SaveEventAction {
- return {
- type: SAVE_EVENT,
- event: eventArgs,
- };
-}
-
-export function clearOnboardingEvents(): ClearEventsAction {
- return {
- type: CLEAR_EVENTS,
- };
-}
\ No newline at end of file
diff --git a/app/component-library/base-components/TagBase/__snapshots__/TagBase.test.tsx.snap b/app/component-library/base-components/TagBase/__snapshots__/TagBase.test.tsx.snap
index a3be1a262ef..3959ad45459 100644
--- a/app/component-library/base-components/TagBase/__snapshots__/TagBase.test.tsx.snap
+++ b/app/component-library/base-components/TagBase/__snapshots__/TagBase.test.tsx.snap
@@ -7,12 +7,14 @@ exports[`TagBase should render TagBase 1`] = `
onLayout={[Function]}
style={
{
+ "alignItems": "center",
"alignSelf": "flex-start",
"backgroundColor": "#ffffff",
"borderColor": "#bbc0c5",
"borderRadius": 999,
"borderWidth": 0,
"color": "#141618",
+ "flexDirection": "row",
"padding": 16,
"paddingHorizontal": 8,
"paddingVertical": 2,
@@ -20,72 +22,63 @@ exports[`TagBase should render TagBase 1`] = `
}
testID="tagbase"
>
-
-
-
+
-
+
- Sample TagBase Children
-
-
+ Sample TagBase Children
+
+
-
+
-
+ }
+ width={20}
+ />
`;
diff --git a/app/component-library/components-temp/CellSelectWithMenu/__snapshots__/CellSelectWithMenu.test.tsx.snap b/app/component-library/components-temp/CellSelectWithMenu/__snapshots__/CellSelectWithMenu.test.tsx.snap
index 3e2ad44c55f..5b97c76e34c 100644
--- a/app/component-library/components-temp/CellSelectWithMenu/__snapshots__/CellSelectWithMenu.test.tsx.snap
+++ b/app/component-library/components-temp/CellSelectWithMenu/__snapshots__/CellSelectWithMenu.test.tsx.snap
@@ -44,7 +44,6 @@ exports[`CellSelectWithMenu should render with default settings correctly 1`] =
-
-
-
-
-
-
+
+
-
-
-
+ }
+ height={32}
+ matrix={
+ [
+ 0.33873792024529126,
+ 0.9408807689542256,
+ -0.9408807689542256,
+ 0.33873792024529126,
+ 50.8847515111068,
+ 5.120153954341607,
+ ]
+ }
+ propList={
+ [
+ "fill",
+ ]
+ }
+ width={32}
+ x={0}
+ y={0}
+ />
+
+
-
+
+
+ Orangefox.eth
+
+
@@ -211,78 +248,32 @@ exports[`CellSelectWithMenu should render with default settings correctly 1`] =
numberOfLines={1}
style={
{
- "color": "#141618",
+ "color": "#6a737d",
"fontFamily": "EuclidCircularB-Regular",
- "fontSize": 16,
+ "fontSize": 14,
"fontWeight": "400",
"letterSpacing": 0,
- "lineHeight": 24,
+ "lineHeight": 22,
}
}
- testID="cellbase-avatar-title"
>
- Orangefox.eth
+ 0x2990079bcdEe240329a520d2444386FC119da21a
-
-
- 0x2990079bcdEe240329a520d2444386FC119da21a
-
-
-
-
+ width={10}
+ />
+
diff --git a/app/component-library/components-temp/KeyValueRow/KeyValueLabel/KeyValueLabel.styles.tsx b/app/component-library/components-temp/KeyValueRow/KeyValueLabel/KeyValueLabel.styles.tsx
deleted file mode 100644
index ae5c4860b71..00000000000
--- a/app/component-library/components-temp/KeyValueRow/KeyValueLabel/KeyValueLabel.styles.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import { StyleSheet } from 'react-native';
-
-const styleSheet = () =>
- StyleSheet.create({
- labelContainer: {
- flexDirection: 'row',
- alignItems: 'center',
- },
- });
-
-export default styleSheet;
diff --git a/app/component-library/components-temp/KeyValueRow/KeyValueLabel/KeyValueLabel.tsx b/app/component-library/components-temp/KeyValueRow/KeyValueLabel/KeyValueLabel.tsx
deleted file mode 100644
index aefa71eecbc..00000000000
--- a/app/component-library/components-temp/KeyValueRow/KeyValueLabel/KeyValueLabel.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import ButtonIcon from '../../../../component-library/components/Buttons/ButtonIcon';
-import Label from '../../../../component-library/components/Form/Label';
-import {
- IconColor,
- IconName,
-} from '../../../../component-library/components/Icons/Icon';
-import {
- TextVariant,
- TextColor,
-} from '../../../../component-library/components/Texts/Text';
-import { useStyles } from '../../../../component-library/hooks';
-import useTooltipModal from '../../../../components/hooks/useTooltipModal';
-import React from 'react';
-import { View } from 'react-native';
-import { KeyValueRowLabelProps, TooltipSizes } from '../KeyValueRow.types';
-import styleSheet from './KeyValueLabel.styles';
-
-/**
- * A label and tooltip component.
- *
- * @param {Object} props - Component props.
- * @param {TextVariant} [props.variant] - Optional text variant. Defaults to TextVariant.BodyMDMedium.
- * @param {TextVariant} [props.color] - Optional text color. Defaults to TextColor.Default.
- * @param {TextVariant} [props.tooltip] - Optional tooltip to render to the right of the label text.
- *
- * @returns {JSX.Element} The rendered KeyValueRowLabel component.
- */
-const KeyValueRowLabel = ({
- label,
- variant = TextVariant.BodyMDMedium,
- color = TextColor.Default,
- tooltip,
-}: KeyValueRowLabelProps) => {
- const { styles } = useStyles(styleSheet, {});
-
- const { openTooltipModal } = useTooltipModal();
-
- const hasTooltip = tooltip?.title && tooltip?.text;
-
- const onNavigateToTooltipModal = () => {
- if (!hasTooltip) return;
- openTooltipModal(tooltip.title, tooltip.text);
- };
-
- return (
-
-
- {hasTooltip && (
-
- )}
-
- );
-};
-
-export default KeyValueRowLabel;
diff --git a/app/component-library/components-temp/KeyValueRow/KeyValueRoot/KeyValueRoot.styles.tsx b/app/component-library/components-temp/KeyValueRow/KeyValueRoot/KeyValueRoot.styles.tsx
deleted file mode 100644
index a3de4af351f..00000000000
--- a/app/component-library/components-temp/KeyValueRow/KeyValueRoot/KeyValueRoot.styles.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { StyleSheet } from 'react-native';
-
-const styleSheet = () =>
- StyleSheet.create({
- rootContainer: {
- flexDirection: 'row',
- justifyContent: 'space-between',
- alignItems: 'center',
- overflow: 'hidden',
- },
- });
-
-export default styleSheet;
diff --git a/app/component-library/components-temp/KeyValueRow/KeyValueRoot/KeyValueRoot.tsx b/app/component-library/components-temp/KeyValueRow/KeyValueRoot/KeyValueRoot.tsx
deleted file mode 100644
index e308488648a..00000000000
--- a/app/component-library/components-temp/KeyValueRow/KeyValueRoot/KeyValueRoot.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { useStyles } from '../../../hooks';
-import React from 'react';
-import { View } from 'react-native';
-import { KeyValueRowRootProps } from '../KeyValueRow.types';
-import styleSheet from './KeyValueRoot.styles';
-
-/**
- * The main container for the KeyValueRow component.
- * When creating custom KeyValueRow components, this must be the outermost component wrapping the two components.
- *
- * e.g.
- * ```
- *
- *
- *
- *
- * ```
- *
- * @component
- * @param {Object} props - Component props.
- * @param {Array} props.children - The two children.
- * @param {ViewProps} [props.style] - Optional styling
- *
- * @returns {JSX.Element} The rendered Root component.
- */
-const KeyValueRowRoot = ({
- children,
- style: customStyles,
-}: KeyValueRowRootProps) => {
- const { styles: defaultStyles } = useStyles(styleSheet, {});
-
- const styles = [defaultStyles.rootContainer, customStyles];
-
- return {children};
-};
-
-export default KeyValueRowRoot;
diff --git a/app/component-library/components-temp/KeyValueRow/KeyValueRow.stories.tsx b/app/component-library/components-temp/KeyValueRow/KeyValueRow.stories.tsx
deleted file mode 100644
index e5a440b3276..00000000000
--- a/app/component-library/components-temp/KeyValueRow/KeyValueRow.stories.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import React from 'react';
-import { withNavigation } from '../../../../storybook/decorators';
-import { View, StyleSheet } from 'react-native';
-import KeyValueRowComponent, {
- KeyValueRowFieldIconSides,
- TooltipSizes,
-} from './index';
-import Text, { TextColor, TextVariant } from '../../components/Texts/Text';
-import Title from '../../../components/Base/Title';
-import { IconColor, IconName, IconSize } from '../../components/Icons/Icon';
-
-const KeyValueRowMeta = {
- title: 'Components Temp / KeyValueRow',
- component: KeyValueRowComponent,
- decorators: [withNavigation],
-};
-
-export default KeyValueRowMeta;
-
-const styles = StyleSheet.create({
- container: {
- padding: 16,
- },
- listItem: {
- marginVertical: 16,
- gap: 16,
- },
-});
-
-export const KeyValueRow = {
- render: () => (
-
- KeyValueRow Component
-
- Prebuilt component displayed below but KeyValueRow stubs are available
- to create new KeyValueRow variants.
-
-
-
-
-
-
-
-
- ),
-};
diff --git a/app/component-library/components-temp/KeyValueRow/KeyValueRow.styles.ts b/app/component-library/components-temp/KeyValueRow/KeyValueRow.styles.ts
deleted file mode 100644
index 33999c44819..00000000000
--- a/app/component-library/components-temp/KeyValueRow/KeyValueRow.styles.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { StyleSheet } from 'react-native';
-
-const styleSheet = () =>
- StyleSheet.create({
- flexRow: {
- flexDirection: 'row',
- alignItems: 'center',
- gap: 8,
- },
- });
-
-export default styleSheet;
diff --git a/app/component-library/components-temp/KeyValueRow/KeyValueRow.test.tsx b/app/component-library/components-temp/KeyValueRow/KeyValueRow.test.tsx
deleted file mode 100644
index a9b00ece7e8..00000000000
--- a/app/component-library/components-temp/KeyValueRow/KeyValueRow.test.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import React from 'react';
-import { render } from '@testing-library/react-native';
-import KeyValueRow from './KeyValueRow';
-import { IconName } from '../../components/Icons/Icon';
-
-jest.mock('@react-navigation/native', () => {
- const actualNav = jest.requireActual('@react-navigation/native');
- return {
- ...actualNav,
- useNavigation: () => ({
- navigate: jest.fn(),
- }),
- };
-});
-
-describe('KeyValueRow', () => {
- describe('Prebuilt Component', () => {
- describe('KeyValueRow', () => {
- it('should render when there is only text', () => {
- const { toJSON } = render(
- ,
- );
-
- expect(toJSON()).toMatchSnapshot();
- });
-
- it('should render text with tooltips', () => {
- const { toJSON } = render(
- ,
- );
-
- expect(toJSON()).toMatchSnapshot();
- });
-
- it('should render text with icons', () => {
- const { toJSON } = render(
- ,
- );
-
- expect(toJSON()).toMatchSnapshot();
- });
-
- it('should render text with icons and tooltips', () => {
- const { toJSON } = render(
- ,
- );
-
- expect(toJSON()).toMatchSnapshot();
- });
- });
- });
-});
diff --git a/app/component-library/components-temp/KeyValueRow/KeyValueRow.tsx b/app/component-library/components-temp/KeyValueRow/KeyValueRow.tsx
deleted file mode 100644
index 18c6300b1cf..00000000000
--- a/app/component-library/components-temp/KeyValueRow/KeyValueRow.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import { useStyles } from '../../hooks';
-import React from 'react';
-import stylesheet from './KeyValueRow.styles';
-import {
- KeyValueRowProps,
- KeyValueRowFieldIconSides,
- KeyValueRowSectionAlignments,
-} from './KeyValueRow.types';
-import Icon from '../../components/Icons/Icon';
-import { View } from 'react-native';
-import { areKeyValueRowPropsEqual } from './KeyValueRow.utils';
-import KeyValueSection from './KeyValueSection/KeyValueSection';
-import KeyValueRowLabel from './KeyValueLabel/KeyValueLabel';
-import KeyValueRowRoot from './KeyValueRoot/KeyValueRoot';
-
-/**
- * Prebuilt convenience component to format and render a key/value KeyValueRowLabel pair.
- * The KeyValueRowLabel component has props to display a tooltip and icon.
- *
- * Examples are in the Storybook: [StorybookLink](./KeyValueRow.stories.tsx)
- *
- * @param {Object} props - Component props
- * @param {KeyValueRowField} props.field - Represents the left side of the key value row pair
- * @param {KeyValueRowField} props.value - Represents the right side of the key value row pair
- * @param {ViewProps} [props.style] - Optional styling
- *
- * @returns {JSX.Element} The rendered KeyValueRow component.
- */
-const KeyValueRow = React.memo(({ field, value, style }: KeyValueRowProps) => {
- const { styles } = useStyles(stylesheet, {});
-
- // Field (left side)
- const fieldIcon = field?.icon;
- const shouldShowFieldIcon = fieldIcon?.name;
-
- // Value (right side)
- const valueIcon = value?.icon;
- const shouldShowValueIcon = valueIcon?.name;
-
- return (
-
-
-
- {shouldShowFieldIcon &&
- (fieldIcon.side === KeyValueRowFieldIconSides.LEFT ||
- fieldIcon.side === KeyValueRowFieldIconSides.BOTH ||
- !fieldIcon?.side) && }
-
- {shouldShowFieldIcon &&
- (fieldIcon?.side === KeyValueRowFieldIconSides.RIGHT ||
- fieldIcon?.side === KeyValueRowFieldIconSides.BOTH) && (
-
- )}
-
-
-
-
- {shouldShowValueIcon &&
- (valueIcon?.side === KeyValueRowFieldIconSides.LEFT ||
- valueIcon?.side === KeyValueRowFieldIconSides.BOTH ||
- !valueIcon?.side) && }
-
- {shouldShowValueIcon &&
- (valueIcon?.side === KeyValueRowFieldIconSides.RIGHT ||
- valueIcon?.side === KeyValueRowFieldIconSides.BOTH) && (
-
- )}
-
-
-
- );
-}, areKeyValueRowPropsEqual);
-
-/**
- * Exported sub-components to provide a base for new KeyValueRow variants.
- */
-export const KeyValueRowStubs = {
- Root: KeyValueRowRoot,
- Section: KeyValueSection,
- Label: KeyValueRowLabel,
-};
-
-export default KeyValueRow;
diff --git a/app/component-library/components-temp/KeyValueRow/KeyValueRow.types.ts b/app/component-library/components-temp/KeyValueRow/KeyValueRow.types.ts
deleted file mode 100644
index 0e9c864d309..00000000000
--- a/app/component-library/components-temp/KeyValueRow/KeyValueRow.types.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-import {
- IconProps,
- IconSize,
-} from '../../../component-library/components/Icons/Icon';
-import { ButtonIconSizes } from '../../components/Buttons/ButtonIcon';
-import { ReactNode } from 'react';
-import { TextProps } from '../../components/Texts/Text/Text.types';
-import { ViewProps } from 'react-native';
-
-/**
- * The optional tooltip tha can be displayed within a KeyValueRowField or KeyValueRowLabel.
- *
- * @see KeyValueRowField
- * @see KeyValueRowLabel
- */
-interface KeyValueRowTooltip {
- /**
- * The title displayed at the top of the tooltip.
- */
- title: string;
- /**
- * The text displayed within the tooltip body.
- */
- text: string;
- /**
- * Optional size of the tooltip icon.
- * @default TooltipSizes.Md
- */
- size?: ButtonIconSizes;
-}
-
-/**
- * Used to position icon in KeyValueRowField
- *
- * @see KeyValueRowField
- */
-export enum KeyValueRowFieldIconSides {
- LEFT = 'LEFT',
- RIGHT = 'RIGHT',
- BOTH = 'BOTH',
-}
-
-/**
- * Represents a field displayed within KeyValueRowProps.
- *
- * @see KeyValueRowProps
- */
-interface KeyValueRowField {
- /**
- * The text to display.
- */
- text: string;
- /**
- * Optional text variant.
- * @default TextVariant.BodyMDMedium
- */
- variant?: TextProps['variant'];
- /**
- * Optional text color.
- * @default TextColor.Default
- */
- color?: TextProps['color'];
- /**
- * Optional icon to display. If undefined, no icon is displayed.
- */
- icon?: IconProps & { side?: KeyValueRowFieldIconSides };
- /**
- * Optional tooltip to display. If undefined, no tooltip is displayed.
- */
- tooltip?: KeyValueRowTooltip;
-}
-
-export const IconSizes = IconSize;
-
-export const TooltipSizes = ButtonIconSizes;
-
-/**
- * The KeyValueRowLabel prop interface.
- *
- * @see KeyValueRowLabel in ./KeyValueRow.tsx
- */
-export interface KeyValueRowLabelProps {
- /**
- * Text to display.
- */
- label: string;
- /**
- * Optional text variant.
- * @default TextVariant.BodyMDMedium
- */
- variant?: TextProps['variant'];
- /**
- * Optional text color.
- * @default TextColor.Default
- */
- color?: TextProps['color'];
- /**
- * Optional tooltip. If undefined, the tooltip won't be displayed.
- */
- tooltip?: KeyValueRowTooltip;
-}
-
-/**
- * Represents the main container for the KeyValueRow component.
- */
-export interface KeyValueRowRootProps {
- /**
- * Must have exactly two children. Adding more will lead to an undesired outcome.
- */
- children: [ReactNode, ReactNode];
- /**
- * Optional styles. Useful for controlling padding and margins.
- */
- style?: ViewProps['style'];
-}
-
-/**
- * Represents the valid KeyValueSection alignments.
- */
-export enum KeyValueRowSectionAlignments {
- LEFT = 'flex-start',
- RIGHT = 'flex-end',
-}
-
-/**
- * The KeyValueSection component props.
- */
-export interface KeyValueSectionProps {
- /**
- * Child components.
- */
- children: ReactNode;
- /**
- * Optional content alignment.
- * @default KeyValueRowSectionAlignments.RIGHT
- */
- align?: KeyValueRowSectionAlignments;
-}
-
-/**
- * The KeyValueRow component props.
- */
-export interface KeyValueRowProps {
- /**
- * The "key" portion of the KeyValueRow (left side).
- * Using the variable name field because key is reserved.
- */
- field: KeyValueRowField;
- /**
- * The "value" portion of the KeyValueRow (right side).
- */
- value: KeyValueRowField;
- /**
- * Optional styles. E.g. specifying padding or margins.
- */
- style?: ViewProps['style'];
-}
diff --git a/app/component-library/components-temp/KeyValueRow/KeyValueRow.utils.ts b/app/component-library/components-temp/KeyValueRow/KeyValueRow.utils.ts
deleted file mode 100644
index bf4c38843e4..00000000000
--- a/app/component-library/components-temp/KeyValueRow/KeyValueRow.utils.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { KeyValueRowProps } from './KeyValueRow.types';
-
-export const areKeyValueRowPropsEqual = (
- prevProps: KeyValueRowProps,
- newProps: KeyValueRowProps,
-) =>
- JSON.stringify(prevProps.field) === JSON.stringify(newProps.field) &&
- JSON.stringify(prevProps.value) === JSON.stringify(newProps.value);
diff --git a/app/component-library/components-temp/KeyValueRow/KeyValueSection/KeyValueSection.styles.tsx b/app/component-library/components-temp/KeyValueRow/KeyValueSection/KeyValueSection.styles.tsx
deleted file mode 100644
index f8d8adf679d..00000000000
--- a/app/component-library/components-temp/KeyValueRow/KeyValueSection/KeyValueSection.styles.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { StyleSheet } from 'react-native';
-
-const styleSheet = () =>
- StyleSheet.create({
- keyValueSectionContainer: {
- flex: 1,
- },
- });
-
-export default styleSheet;
diff --git a/app/component-library/components-temp/KeyValueRow/KeyValueSection/KeyValueSection.tsx b/app/component-library/components-temp/KeyValueRow/KeyValueSection/KeyValueSection.tsx
deleted file mode 100644
index 7c01d2b438a..00000000000
--- a/app/component-library/components-temp/KeyValueRow/KeyValueSection/KeyValueSection.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from 'react';
-import { useStyles } from '../../../hooks';
-import { View } from 'react-native';
-import {
- KeyValueRowSectionAlignments,
- KeyValueSectionProps,
-} from '../KeyValueRow.types';
-import stylesSheet from './KeyValueSection.styles';
-
-/**
- * A container representing either the left or right side of the KeyValueRow.
- * For desired results, use only two components within the .
- *
- * @component
- * @param {Object} props - Component props.
- * @param {ReactNode} props.children - The child components.
- * @param {KeyValueRowSectionAlignments} [props.align] - The alignment of the KeyValueSection. Defaults to KeyValueRowSectionAlignments.RIGHT
- *
- * @returns {JSX.Element} The rendered KeyValueSection component.
- */
-const KeyValueSection = ({
- children,
- align = KeyValueRowSectionAlignments.LEFT,
-}: KeyValueSectionProps) => {
- const { styles } = useStyles(stylesSheet, {});
-
- return (
-
- {children}
-
- );
-};
-
-export default KeyValueSection;
diff --git a/app/component-library/components-temp/KeyValueRow/__snapshots__/KeyValueRow.test.tsx.snap b/app/component-library/components-temp/KeyValueRow/__snapshots__/KeyValueRow.test.tsx.snap
deleted file mode 100644
index c83d3a4fd5f..00000000000
--- a/app/component-library/components-temp/KeyValueRow/__snapshots__/KeyValueRow.test.tsx.snap
+++ /dev/null
@@ -1,609 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`KeyValueRow Prebuilt Component KeyValueRow should render text with icons 1`] = `
-
-
-
-
-
-
- Key Text
-
-
-
-
-
-
-
-
-
- Value Text
-
-
-
-
-
-`;
-
-exports[`KeyValueRow Prebuilt Component KeyValueRow should render text with icons and tooltips 1`] = `
-
-
-
-
-
-
- Key Text
-
-
-
-
-
-
-
-
-
-
-
-
- Value Text
-
-
-
-
-
-
-
-
-`;
-
-exports[`KeyValueRow Prebuilt Component KeyValueRow should render text with tooltips 1`] = `
-
-
-
-
-
- Key Text
-
-
-
-
-
-
-
-
-
-
-
- Value Text
-
-
-
-
-
-
-
-
-`;
-
-exports[`KeyValueRow Prebuilt Component KeyValueRow should render when there is only text 1`] = `
-
-
-
-
-
- Sample Key Text
-
-
-
-
-
-
-
-
- Sample Value Text
-
-
-
-
-
-`;
diff --git a/app/component-library/components-temp/KeyValueRow/index.tsx b/app/component-library/components-temp/KeyValueRow/index.tsx
deleted file mode 100644
index ee4a0c18825..00000000000
--- a/app/component-library/components-temp/KeyValueRow/index.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-export { KeyValueRowStubs, default } from './KeyValueRow';
-export {
- KeyValueRowSectionAlignments,
- KeyValueRowFieldIconSides,
- TooltipSizes,
- IconSizes,
-} from './KeyValueRow.types';
-export type * from './KeyValueRow.types';
diff --git a/app/component-library/components-temp/ListItemMultiSelectButton/__snapshots__/ListItemMultiSelectButton.test.tsx.snap b/app/component-library/components-temp/ListItemMultiSelectButton/__snapshots__/ListItemMultiSelectButton.test.tsx.snap
index 0baaf1dd60b..278ed889370 100644
--- a/app/component-library/components-temp/ListItemMultiSelectButton/__snapshots__/ListItemMultiSelectButton.test.tsx.snap
+++ b/app/component-library/components-temp/ListItemMultiSelectButton/__snapshots__/ListItemMultiSelectButton.test.tsx.snap
@@ -40,16 +40,7 @@ exports[`ListItemMultiSelectButton should render correctly with default props 1`
}
}
>
-
-
-
+
diff --git a/app/component-library/components/Cells/Cell/__snapshots__/Cell.test.tsx.snap b/app/component-library/components/Cells/Cell/__snapshots__/Cell.test.tsx.snap
index a3d36f307dd..310992b6f65 100644
--- a/app/component-library/components/Cells/Cell/__snapshots__/Cell.test.tsx.snap
+++ b/app/component-library/components/Cells/Cell/__snapshots__/Cell.test.tsx.snap
@@ -270,6 +270,7 @@ exports[`Cell should render CellMultiSelect given the type MultiSelect 1`] = `
disabled={false}
style={
{
+ "alignItems": "flex-start",
"backgroundColor": "#ffffff",
"borderRadius": 4,
"opacity": 1,
@@ -283,252 +284,275 @@ exports[`Cell should render CellMultiSelect given the type MultiSelect 1`] = `
accessible={true}
style={
{
+ "alignItems": "center",
+ "flexDirection": "row",
"padding": 0,
}
}
>
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
-
-
-
+ }
+ height={32}
+ matrix={
+ [
+ 0.33873792024529126,
+ 0.9408807689542256,
+ -0.9408807689542256,
+ 0.33873792024529126,
+ 50.8847515111068,
+ 5.120153954341607,
+ ]
+ }
+ propList={
+ [
+ "fill",
+ ]
+ }
+ width={32}
+ x={0}
+ y={0}
+ />
+
+
-
+
+
-
+
- Orangefox.eth
-
-
+ 0x2990079bcdEe240329a520d2444386FC119da21a
+
+
- 0x2990079bcdEe240329a520d2444386FC119da21a
-
+ }
+ >
+ Updated 1 sec ago
+
+
- Updated 1 sec ago
+ Imported
-
-
- Imported
-
-
@@ -584,6 +578,7 @@ exports[`Cell should render CellSelect given the type Select 1`] = `
"backgroundColor": "#ffffff",
"borderRadius": 4,
"opacity": 1,
+ "padding": 16,
"position": "relative",
}
}
@@ -594,14 +589,15 @@ exports[`Cell should render CellSelect given the type Select 1`] = `
accessible={true}
style={
{
- "padding": 16,
+ "alignItems": "center",
+ "flexDirection": "row",
+ "padding": 0,
}
}
>
-
-
-
-
-
-
+
+
-
-
-
+ }
+ height={32}
+ matrix={
+ [
+ 0.33873792024529126,
+ 0.9408807689542256,
+ -0.9408807689542256,
+ 0.33873792024529126,
+ 50.8847515111068,
+ 5.120153954341607,
+ ]
+ }
+ propList={
+ [
+ "fill",
+ ]
+ }
+ width={32}
+ x={0}
+ y={0}
+ />
+
+
-
+
+
-
+
- Orangefox.eth
-
-
+ 0x2990079bcdEe240329a520d2444386FC119da21a
+
+
- 0x2990079bcdEe240329a520d2444386FC119da21a
-
+ }
+ >
+ Updated 1 sec ago
+
+
- Updated 1 sec ago
+ Imported
-
-
- Imported
-
-
diff --git a/app/component-library/components/Cells/Cell/variants/CellMultiSelect/__snapshots__/CellMultiSelect.test.tsx.snap b/app/component-library/components/Cells/Cell/variants/CellMultiSelect/__snapshots__/CellMultiSelect.test.tsx.snap
index ab5aef4d21f..81a2ddfbd11 100644
--- a/app/component-library/components/Cells/Cell/variants/CellMultiSelect/__snapshots__/CellMultiSelect.test.tsx.snap
+++ b/app/component-library/components/Cells/Cell/variants/CellMultiSelect/__snapshots__/CellMultiSelect.test.tsx.snap
@@ -5,6 +5,7 @@ exports[`CellMultiSelect should render default settings correctly 1`] = `
disabled={false}
style={
{
+ "alignItems": "flex-start",
"backgroundColor": "#ffffff",
"borderRadius": 4,
"opacity": 1,
@@ -18,252 +19,275 @@ exports[`CellMultiSelect should render default settings correctly 1`] = `
accessible={true}
style={
{
+ "alignItems": "center",
+ "flexDirection": "row",
"padding": 0,
}
}
>
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
-
-
-
+ }
+ height={32}
+ matrix={
+ [
+ 0.33873792024529126,
+ 0.9408807689542256,
+ -0.9408807689542256,
+ 0.33873792024529126,
+ 50.8847515111068,
+ 5.120153954341607,
+ ]
+ }
+ propList={
+ [
+ "fill",
+ ]
+ }
+ width={32}
+ x={0}
+ y={0}
+ />
+
+
-
+
+
-
+
- Orangefox.eth
-
-
+ 0x2990079bcdEe240329a520d2444386FC119da21a
+
+
- 0x2990079bcdEe240329a520d2444386FC119da21a
-
+ }
+ >
+ Updated 1 sec ago
+
+
- Updated 1 sec ago
+ Imported
-
-
- Imported
-
-
diff --git a/app/component-library/components/Cells/Cell/variants/CellSelect/__snapshots__/CellSelect.test.tsx.snap b/app/component-library/components/Cells/Cell/variants/CellSelect/__snapshots__/CellSelect.test.tsx.snap
index 615ce5c9784..abdabeda711 100644
--- a/app/component-library/components/Cells/Cell/variants/CellSelect/__snapshots__/CellSelect.test.tsx.snap
+++ b/app/component-library/components/Cells/Cell/variants/CellSelect/__snapshots__/CellSelect.test.tsx.snap
@@ -8,6 +8,7 @@ exports[`CellSelect should render default settings correctly 1`] = `
"backgroundColor": "#ffffff",
"borderRadius": 4,
"opacity": 1,
+ "padding": 16,
"position": "relative",
}
}
@@ -18,14 +19,15 @@ exports[`CellSelect should render default settings correctly 1`] = `
accessible={true}
style={
{
- "padding": 16,
+ "alignItems": "center",
+ "flexDirection": "row",
+ "padding": 0,
}
}
>
-
-
-
-
-
-
+
+
-
-
-
+ }
+ height={32}
+ matrix={
+ [
+ 0.33873792024529126,
+ 0.9408807689542256,
+ -0.9408807689542256,
+ 0.33873792024529126,
+ 50.8847515111068,
+ 5.120153954341607,
+ ]
+ }
+ propList={
+ [
+ "fill",
+ ]
+ }
+ width={32}
+ x={0}
+ y={0}
+ />
+
+
-
+
+
-
+
- Orangefox.eth
-
-
+ 0x2990079bcdEe240329a520d2444386FC119da21a
+
+
- 0x2990079bcdEe240329a520d2444386FC119da21a
-
+ }
+ >
+ Updated 1 sec ago
+
+
- Updated 1 sec ago
+ Imported
-
-
- Imported
-
-
diff --git a/app/component-library/components/List/ListItem/ListItem.constants.ts b/app/component-library/components/List/ListItem/ListItem.constants.ts
index 8ee1fb524fd..3003517c37c 100644
--- a/app/component-library/components/List/ListItem/ListItem.constants.ts
+++ b/app/component-library/components/List/ListItem/ListItem.constants.ts
@@ -9,13 +9,9 @@ export const TESTID_LISTITEM_GAP = 'listitem-gap';
// Defaults
export const DEFAULT_LISTITEM_GAP = 16;
export const DEFAULT_LISTITEM_VERTICALALIGNMENT = VerticalAlignment.Center;
-export const DEFAULT_LISTITEM_TOPACCESSORYGAP = 0;
-export const DEFAULT_LISTITEM_BOTTOMACCESSORYGAP = 0;
// Sample consts
export const SAMPLE_LISTITEM_PROPS: ListItemProps = {
gap: DEFAULT_LISTITEM_GAP,
verticalAlignment: DEFAULT_LISTITEM_VERTICALALIGNMENT,
- topAccessoryGap: DEFAULT_LISTITEM_TOPACCESSORYGAP,
- bottomAccessoryGap: DEFAULT_LISTITEM_BOTTOMACCESSORYGAP,
};
diff --git a/app/component-library/components/List/ListItem/ListItem.stories.tsx b/app/component-library/components/List/ListItem/ListItem.stories.tsx
index 083abaee263..d6e35986846 100644
--- a/app/component-library/components/List/ListItem/ListItem.stories.tsx
+++ b/app/component-library/components/List/ListItem/ListItem.stories.tsx
@@ -26,36 +26,6 @@ const ListItemMeta = {
},
defaultValue: SAMPLE_LISTITEM_PROPS.verticalAlignment,
},
- topAccessory: {
- control: { type: 'boolean' },
- defaultValue: false,
- mapping: {
- false: null,
- true: (
- Sample Top Accessory
- ),
- },
- },
- bottomAccessory: {
- control: { type: 'boolean' },
- defaultValue: false,
- mapping: {
- false: null,
- true: (
-
- Sample Bottom Accessory
-
- ),
- },
- },
- topAccessoryGap: {
- control: { type: 'number' },
- defaultValue: SAMPLE_LISTITEM_PROPS.topAccessoryGap,
- },
- bottomAccessoryGap: {
- control: { type: 'number' },
- defaultValue: SAMPLE_LISTITEM_PROPS.bottomAccessoryGap,
- },
},
};
export default ListItemMeta;
diff --git a/app/component-library/components/List/ListItem/ListItem.styles.ts b/app/component-library/components/List/ListItem/ListItem.styles.ts
index df6305cdc20..25d5fc68d40 100644
--- a/app/component-library/components/List/ListItem/ListItem.styles.ts
+++ b/app/component-library/components/List/ListItem/ListItem.styles.ts
@@ -17,8 +17,7 @@ import { VerticalAlignment, ListItemStyleSheetVars } from './ListItem.types';
*/
const styleSheet = (params: { theme: Theme; vars: ListItemStyleSheetVars }) => {
const { vars } = params;
- const { style, verticalAlignment, topAccessoryGap, bottomAccessoryGap } =
- vars;
+ const { style, verticalAlignment } = vars;
let alignItems;
switch (verticalAlignment) {
case VerticalAlignment.Center:
@@ -36,19 +35,11 @@ const styleSheet = (params: { theme: Theme; vars: ListItemStyleSheetVars }) => {
base: Object.assign(
{
padding: 16,
+ flexDirection: 'row',
+ alignItems,
} as ViewStyle,
style,
) as ViewStyle,
- item: {
- flexDirection: 'row',
- alignItems,
- } as ViewStyle,
- topAccessory: {
- marginBottom: topAccessoryGap ?? 0,
- },
- bottomAccessory: {
- marginTop: bottomAccessoryGap ?? 0,
- },
});
};
diff --git a/app/component-library/components/List/ListItem/ListItem.test.tsx b/app/component-library/components/List/ListItem/ListItem.test.tsx
index 34a40bacfd4..84211b78cd4 100644
--- a/app/component-library/components/List/ListItem/ListItem.test.tsx
+++ b/app/component-library/components/List/ListItem/ListItem.test.tsx
@@ -23,51 +23,6 @@ describe('ListItem', () => {
expect(wrapper).toMatchSnapshot();
});
- it('should render the top accessory', () => {
- const wrapper = render(
- }>
-
- ,
- );
- expect(wrapper).toMatchSnapshot();
- });
-
- it('should render the bottom accessory', () => {
- const wrapper = render(
- }>
-
- ,
- );
- expect(wrapper).toMatchSnapshot();
- });
-
- it('should render the correct topAccessoryGap', () => {
- const givenTopAccessoryGap = 20;
- const { getByRole } = render(
- } topAccessoryGap={givenTopAccessoryGap}>
-
- ,
- );
- expect(getByRole('none').props.children[0].props.style.marginBottom).toBe(
- givenTopAccessoryGap,
- );
- });
-
- it('should render the correct bottomAccessoryGap', () => {
- const givenBottomAccessoryGap = 20;
- const { getByRole } = render(
- }
- bottomAccessoryGap={givenBottomAccessoryGap}
- >
-
- ,
- );
- expect(getByRole('none').props.children[2].props.style.marginTop).toBe(
- givenBottomAccessoryGap,
- );
- });
-
it('should render the correct default gap', () => {
const { getByTestId } = render(
@@ -106,9 +61,7 @@ describe('ListItem', () => {
,
);
- expect(getByRole('none').props.children[1].props.style.alignItems).toBe(
- 'center',
- );
+ expect(getByRole('none').props.style.alignItems).toBe('center');
});
it('should render the given verticalAlignment', () => {
@@ -117,9 +70,6 @@ describe('ListItem', () => {
,
);
-
- expect(getByRole('none').props.children[1].props.style.alignItems).toBe(
- 'flex-start',
- );
+ expect(getByRole('none').props.style.alignItems).toBe('flex-start');
});
});
diff --git a/app/component-library/components/List/ListItem/ListItem.tsx b/app/component-library/components/List/ListItem/ListItem.tsx
index 7c86fbfbe53..5c96fec91d5 100644
--- a/app/component-library/components/List/ListItem/ListItem.tsx
+++ b/app/component-library/components/List/ListItem/ListItem.tsx
@@ -19,10 +19,6 @@ import {
const ListItem: React.FC = ({
style,
children,
- topAccessory,
- bottomAccessory,
- topAccessoryGap,
- bottomAccessoryGap,
gap = DEFAULT_LISTITEM_GAP,
verticalAlignment = DEFAULT_LISTITEM_VERTICALALIGNMENT,
...props
@@ -30,32 +26,24 @@ const ListItem: React.FC = ({
const { styles } = useStyles(styleSheet, {
style,
verticalAlignment,
- topAccessoryGap,
- bottomAccessoryGap,
});
return (
- {topAccessory && {topAccessory}}
-
- {React.Children.toArray(children)
- .filter((child) => !!child)
- .map((child, index) => (
-
- {index > 0 && (
-
- )}
- {child}
-
- ))}
-
- {bottomAccessory && (
- {bottomAccessory}
- )}
+ {React.Children.toArray(children)
+ .filter((child) => !!child)
+ .map((child, index) => (
+
+ {index > 0 && (
+
+ )}
+ {child}
+
+ ))}
);
};
diff --git a/app/component-library/components/List/ListItem/ListItem.types.ts b/app/component-library/components/List/ListItem/ListItem.types.ts
index 18a905c72e1..1ab097d5935 100644
--- a/app/component-library/components/List/ListItem/ListItem.types.ts
+++ b/app/component-library/components/List/ListItem/ListItem.types.ts
@@ -18,22 +18,6 @@ export interface ListItemProps extends ViewProps {
* Content to wrap to display.
*/
children?: React.ReactNode;
- /**
- * Optional prop to include content to be displayed above the ListItem.
- */
- topAccessory?: React.ReactNode;
- /**
- * Optional prop to include content to be displayed below the ListItem.
- */
- bottomAccessory?: React.ReactNode;
- /**
- * Optional prop to configure the gap between the topAccessory and the ListItem.
- */
- topAccessoryGap?: number;
- /**
- * Optional prop to configure the gap between the bottomAccessory and the ListItem.
- */
- bottomAccessoryGap?: number;
/**
* Optional prop to configure the gap between items inside the ListItem.
*/
@@ -53,5 +37,5 @@ export interface ListItemProps extends ViewProps {
*/
export type ListItemStyleSheetVars = Pick<
ListItemProps,
- 'style' | 'verticalAlignment' | 'topAccessoryGap' | 'bottomAccessoryGap'
+ 'style' | 'verticalAlignment'
>;
diff --git a/app/component-library/components/List/ListItem/__snapshots__/ListItem.test.tsx.snap b/app/component-library/components/List/ListItem/__snapshots__/ListItem.test.tsx.snap
index e23d2a00c93..a197bdd692f 100644
--- a/app/component-library/components/List/ListItem/__snapshots__/ListItem.test.tsx.snap
+++ b/app/component-library/components/List/ListItem/__snapshots__/ListItem.test.tsx.snap
@@ -6,83 +6,12 @@ exports[`ListItem should render snapshot correctly 1`] = `
accessible={true}
style={
{
+ "alignItems": "center",
+ "flexDirection": "row",
"padding": 16,
}
}
>
-
-
-
-
-`;
-
-exports[`ListItem should render the bottom accessory 1`] = `
-
-
-
-
-
-
-
-
-`;
-
-exports[`ListItem should render the top accessory 1`] = `
-
-
-
-
-
-
-
+
`;
diff --git a/app/component-library/components/List/ListItemMultiSelect/ListItemMultiSelect.styles.ts b/app/component-library/components/List/ListItemMultiSelect/ListItemMultiSelect.styles.ts
index 8bd81b3bb46..e317e812ab8 100644
--- a/app/component-library/components/List/ListItemMultiSelect/ListItemMultiSelect.styles.ts
+++ b/app/component-library/components/List/ListItemMultiSelect/ListItemMultiSelect.styles.ts
@@ -27,6 +27,7 @@ const styleSheet = (params: {
{
padding: 16,
borderRadius: 4,
+ alignItems: 'flex-start',
backgroundColor: colors.background.default,
opacity: isDisabled ? 0.5 : 1,
} as ViewStyle,
diff --git a/app/component-library/components/List/ListItemMultiSelect/__snapshots__/ListItemMultiSelect.test.tsx.snap b/app/component-library/components/List/ListItemMultiSelect/__snapshots__/ListItemMultiSelect.test.tsx.snap
index 853d6669561..8ad70722b3d 100644
--- a/app/component-library/components/List/ListItemMultiSelect/__snapshots__/ListItemMultiSelect.test.tsx.snap
+++ b/app/component-library/components/List/ListItemMultiSelect/__snapshots__/ListItemMultiSelect.test.tsx.snap
@@ -5,6 +5,7 @@ exports[`ListItemMultiSelect should render snapshot correctly 1`] = `
disabled={false}
style={
{
+ "alignItems": "flex-start",
"backgroundColor": "#ffffff",
"borderRadius": 4,
"opacity": 1,
@@ -17,57 +18,50 @@ exports[`ListItemMultiSelect should render snapshot correctly 1`] = `
accessible={true}
style={
{
+ "alignItems": "center",
+ "flexDirection": "row",
"padding": 0,
}
}
>
-
-
-
-
-
-
+
+
+
`;
diff --git a/app/component-library/components/List/ListItemSelect/ListItemSelect.styles.ts b/app/component-library/components/List/ListItemSelect/ListItemSelect.styles.ts
index 5e590a70708..f7ef433fe81 100644
--- a/app/component-library/components/List/ListItemSelect/ListItemSelect.styles.ts
+++ b/app/component-library/components/List/ListItemSelect/ListItemSelect.styles.ts
@@ -27,6 +27,7 @@ const styleSheet = (params: {
{
position: 'relative',
opacity: isDisabled ? 0.5 : 1,
+ padding: 16,
borderRadius: 4,
backgroundColor: colors.background.default,
} as ViewStyle,
@@ -38,7 +39,7 @@ const styleSheet = (params: {
backgroundColor: colors.primary.muted,
},
listItem: {
- padding: 16,
+ padding: 0,
},
underlayBar: {
marginVertical: 4,
diff --git a/app/component-library/components/List/ListItemSelect/__snapshots__/ListItemSelect.test.tsx.snap b/app/component-library/components/List/ListItemSelect/__snapshots__/ListItemSelect.test.tsx.snap
index 0fca6037af1..4199cc4eb07 100644
--- a/app/component-library/components/List/ListItemSelect/__snapshots__/ListItemSelect.test.tsx.snap
+++ b/app/component-library/components/List/ListItemSelect/__snapshots__/ListItemSelect.test.tsx.snap
@@ -8,6 +8,7 @@ exports[`ListItemSelect should render snapshot correctly 1`] = `
"backgroundColor": "#ffffff",
"borderRadius": 4,
"opacity": 1,
+ "padding": 16,
"position": "relative",
}
}
@@ -17,20 +18,13 @@ exports[`ListItemSelect should render snapshot correctly 1`] = `
accessible={true}
style={
{
- "padding": 16,
+ "alignItems": "center",
+ "flexDirection": "row",
+ "padding": 0,
}
}
>
-
-
-
+
`;
diff --git a/app/component-library/components/Pickers/PickerAccount/PickerAccount.tsx b/app/component-library/components/Pickers/PickerAccount/PickerAccount.tsx
index ce9a9ab9014..5a4c293777f 100644
--- a/app/component-library/components/Pickers/PickerAccount/PickerAccount.tsx
+++ b/app/component-library/components/Pickers/PickerAccount/PickerAccount.tsx
@@ -51,7 +51,7 @@ const PickerAccount: React.ForwardRefRenderFunction<
/>
{accountName}
diff --git a/app/component-library/components/Pickers/PickerAccount/__snapshots__/PickerAccount.test.tsx.snap b/app/component-library/components/Pickers/PickerAccount/__snapshots__/PickerAccount.test.tsx.snap
index 0afdb8affeb..f2c7d176b13 100644
--- a/app/component-library/components/Pickers/PickerAccount/__snapshots__/PickerAccount.test.tsx.snap
+++ b/app/component-library/components/Pickers/PickerAccount/__snapshots__/PickerAccount.test.tsx.snap
@@ -178,11 +178,11 @@ exports[`PickerAccount should render correctly 1`] = `
style={
{
"color": "#141618",
- "fontFamily": "EuclidCircularB-Medium",
- "fontSize": 14,
- "fontWeight": "500",
+ "fontFamily": "EuclidCircularB-Regular",
+ "fontSize": 16,
+ "fontWeight": "400",
"letterSpacing": 0,
- "lineHeight": 22,
+ "lineHeight": 24,
}
}
testID="account-label"
@@ -207,7 +207,7 @@ exports[`PickerAccount should render correctly 1`] = `
diff --git a/app/component-library/components/Pickers/PickerBase/__snapshots__/PickerBase.test.tsx.snap b/app/component-library/components/Pickers/PickerBase/__snapshots__/PickerBase.test.tsx.snap
index f93ccf2a438..6d3ac0d242b 100644
--- a/app/component-library/components/Pickers/PickerBase/__snapshots__/PickerBase.test.tsx.snap
+++ b/app/component-library/components/Pickers/PickerBase/__snapshots__/PickerBase.test.tsx.snap
@@ -17,7 +17,7 @@ exports[`PickerBase should render correctly 1`] = `
>
-
-
-
-
-
-
+
+
-
-
-
+ }
+ height={32}
+ matrix={
+ [
+ -0.9438009515832294,
+ 0.3305143927132231,
+ -0.3305143927132231,
+ -0.9438009515832294,
+ 58.82830600098727,
+ 40.20612936020905,
+ ]
+ }
+ propList={
+ [
+ "fill",
+ ]
+ }
+ width={32}
+ x={0}
+ y={0}
+ />
+
+
-
+
+
+
-
+ Sample SelectButton label
+
+
-
- Sample SelectButton label
-
-
- Sample SelectButton description
-
-
+ Sample SelectButton description
+
diff --git a/app/component-library/components/Select/SelectButton/foundation/__snapshots__/SelectButtonBase.test.tsx.snap b/app/component-library/components/Select/SelectButton/foundation/__snapshots__/SelectButtonBase.test.tsx.snap
index b73b687f331..6506738d46b 100644
--- a/app/component-library/components/Select/SelectButton/foundation/__snapshots__/SelectButtonBase.test.tsx.snap
+++ b/app/component-library/components/Select/SelectButton/foundation/__snapshots__/SelectButtonBase.test.tsx.snap
@@ -16,7 +16,9 @@ exports[`SelectButtonBase should render snapshot correctly 1`] = `
accessible={true}
style={
{
+ "alignItems": "center",
"flex": 1,
+ "flexDirection": "row",
"marginRight": 8,
"padding": 0,
}
@@ -25,209 +27,200 @@ exports[`SelectButtonBase should render snapshot correctly 1`] = `
-
-
-
-
-
-
+
+
-
-
-
+ }
+ height={32}
+ matrix={
+ [
+ -0.9438009515832294,
+ 0.3305143927132231,
+ -0.3305143927132231,
+ -0.9438009515832294,
+ 58.82830600098727,
+ 40.20612936020905,
+ ]
+ }
+ propList={
+ [
+ "fill",
+ ]
+ }
+ width={32}
+ x={0}
+ y={0}
+ />
+
+
-
+
+
+
-
+ Sample SelectValue label
+
+
-
- Sample SelectValue label
-
-
- Sample SelectValue description
-
-
+ Sample SelectValue description
+
diff --git a/app/component-library/components/Select/SelectOption/__snapshots__/SelectOption.test.tsx.snap b/app/component-library/components/Select/SelectOption/__snapshots__/SelectOption.test.tsx.snap
index 3e2315357d9..f4844f6ac4a 100644
--- a/app/component-library/components/Select/SelectOption/__snapshots__/SelectOption.test.tsx.snap
+++ b/app/component-library/components/Select/SelectOption/__snapshots__/SelectOption.test.tsx.snap
@@ -9,6 +9,7 @@ exports[`SelectOption should render snapshot correctly 1`] = `
"backgroundColor": "#ffffff",
"borderRadius": 4,
"opacity": 1,
+ "padding": 16,
"position": "relative",
}
}
@@ -18,235 +19,220 @@ exports[`SelectOption should render snapshot correctly 1`] = `
accessible={true}
style={
{
- "padding": 16,
+ "alignItems": "center",
+ "flexDirection": "row",
+ "padding": 0,
}
}
>
-
+
-
-
+
-
+
-
-
-
-
-
-
-
+ }
+ height={32}
+ matrix={
+ [
+ -0.9438009515832294,
+ 0.3305143927132231,
+ -0.3305143927132231,
+ -0.9438009515832294,
+ 58.82830600098727,
+ 40.20612936020905,
+ ]
+ }
+ propList={
+ [
+ "fill",
+ ]
+ }
+ width={32}
+ x={0}
+ y={0}
+ />
+
+
-
+
+
+
+
-
+ Sample SelectOption label
+
+
-
- Sample SelectOption label
-
-
- Sample SelectOption description
-
-
-
+ }
+ >
+ Sample SelectOption description
+
diff --git a/app/component-library/components/Select/SelectValue/SelectValue.styles.ts b/app/component-library/components/Select/SelectValue/SelectValue.styles.ts
index d8eead46b1a..090e2954d54 100644
--- a/app/component-library/components/Select/SelectValue/SelectValue.styles.ts
+++ b/app/component-library/components/Select/SelectValue/SelectValue.styles.ts
@@ -26,7 +26,6 @@ const styleSheet = (params: {
base: Object.assign(
{
padding: 0,
- flex: 1,
} as ViewStyle,
style,
) as ViewStyle,
diff --git a/app/component-library/components/Select/SelectValue/__snapshots__/SelectValue.test.tsx.snap b/app/component-library/components/Select/SelectValue/__snapshots__/SelectValue.test.tsx.snap
index 9db4ae456c2..f70bceb8b37 100644
--- a/app/component-library/components/Select/SelectValue/__snapshots__/SelectValue.test.tsx.snap
+++ b/app/component-library/components/Select/SelectValue/__snapshots__/SelectValue.test.tsx.snap
@@ -6,7 +6,8 @@ exports[`SelectValue should render snapshot correctly 1`] = `
accessible={true}
style={
{
- "flex": 1,
+ "alignItems": "center",
+ "flexDirection": "row",
"padding": 0,
}
}
@@ -14,209 +15,200 @@ exports[`SelectValue should render snapshot correctly 1`] = `
-
-
-
-
-
-
+
+
-
-
-
+ }
+ height={32}
+ matrix={
+ [
+ -0.9438009515832294,
+ 0.3305143927132231,
+ -0.3305143927132231,
+ -0.9438009515832294,
+ 58.82830600098727,
+ 40.20612936020905,
+ ]
+ }
+ propList={
+ [
+ "fill",
+ ]
+ }
+ width={32}
+ x={0}
+ y={0}
+ />
+
+
-
+
+
+
-
+ Sample SelectValue label
+
+
-
- Sample SelectValue label
-
-
- Sample SelectValue description
-
-
+ Sample SelectValue description
+
`;
diff --git a/app/components/Base/ModalDragger.tsx b/app/components/Base/ModalDragger.js
similarity index 80%
rename from app/components/Base/ModalDragger.tsx
rename to app/components/Base/ModalDragger.js
index cb0ea3f1fd1..3e1c58daf26 100644
--- a/app/components/Base/ModalDragger.tsx
+++ b/app/components/Base/ModalDragger.js
@@ -1,14 +1,10 @@
import React from 'react';
+import PropTypes from 'prop-types';
import { StyleSheet, View } from 'react-native';
import { useTheme } from '../../util/theme';
-import { Theme } from '@metamask/design-tokens';
import { colors as importedColors } from '../../styles/common';
-interface ModalDraggerProps {
- borderless?: boolean;
-}
-
-const createStyles = (colors: Theme['colors']) =>
+const createStyles = (colors) =>
StyleSheet.create({
draggerWrapper: {
width: '100%',
@@ -29,7 +25,7 @@ const createStyles = (colors: Theme['colors']) =>
},
});
-function ModalDragger({ borderless }: ModalDraggerProps) {
+function ModalDragger({ borderless }) {
const { colors } = useTheme();
const styles = createStyles(colors);
@@ -40,4 +36,8 @@ function ModalDragger({ borderless }: ModalDraggerProps) {
);
}
+ModalDragger.propTypes = {
+ borderless: PropTypes.bool,
+};
+
export default ModalDragger;
diff --git a/app/components/Base/SelectorButton.tsx b/app/components/Base/SelectorButton.js
similarity index 65%
rename from app/components/Base/SelectorButton.tsx
rename to app/components/Base/SelectorButton.js
index b886dd85ce9..1c3d2d79444 100644
--- a/app/components/Base/SelectorButton.tsx
+++ b/app/components/Base/SelectorButton.js
@@ -1,16 +1,10 @@
import React from 'react';
-import { View, StyleSheet, TouchableOpacity, TouchableOpacityProps, GestureResponderEvent } from 'react-native';
+import PropTypes from 'prop-types';
+import { View, StyleSheet, TouchableOpacity } from 'react-native';
import Icon from 'react-native-vector-icons/FontAwesome';
import { useTheme } from '../../util/theme';
-import { Theme } from '@metamask/design-tokens';
-interface SelectorButtonProps {
- onPress: (event: GestureResponderEvent) => void;
- disabled?: boolean;
- children: React.ReactNode;
-}
-
-const createStyles = (colors: Theme['colors']) =>
+const createStyles = (colors) =>
StyleSheet.create({
container: {
backgroundColor: colors.background.alternative,
@@ -29,7 +23,7 @@ const createStyles = (colors: Theme['colors']) =>
},
});
-const SelectorButton: React.FC = ({ onPress, disabled, children, ...props }) => {
+function SelectorButton({ onPress, disabled, children, ...props }) {
const { colors } = useTheme();
const styles = createStyles(colors);
@@ -41,6 +35,12 @@ const SelectorButton: React.FC = ({
);
+}
+
+SelectorButton.propTypes = {
+ children: PropTypes.node,
+ onPress: PropTypes.func,
+ disabled: PropTypes.bool,
};
export default SelectorButton;
diff --git a/app/components/Base/Summary.tsx b/app/components/Base/Summary.js
similarity index 58%
rename from app/components/Base/Summary.tsx
rename to app/components/Base/Summary.js
index 6a953cf82bd..2b89be27a0c 100644
--- a/app/components/Base/Summary.tsx
+++ b/app/components/Base/Summary.js
@@ -1,9 +1,9 @@
import React from 'react';
-import { View, StyleSheet, ViewStyle, StyleProp } from 'react-native';
+import PropTypes from 'prop-types';
+import { View, StyleSheet } from 'react-native';
import { useTheme } from '../../util/theme';
-import type { Theme as DesignTokenTheme } from '@metamask/design-tokens';
-const createStyles = (colors: DesignTokenTheme['colors']) =>
+const createStyles = (colors) =>
StyleSheet.create({
wrapper: {
borderWidth: 1,
@@ -40,33 +40,11 @@ const useGetStyles = () => {
return createStyles(colors);
};
-interface SummaryProps {
- style?: StyleProp;
-}
-
-interface SummaryRowProps extends SummaryProps {
- end?: boolean;
- last?: boolean;
-}
-
-interface SummaryColProps extends SummaryProps {
- end?: boolean;
-}
-
-interface SummarySeparatorProps extends SummaryProps {}
-
-interface SummaryComponent extends React.FC {
- Row: React.FC;
- Col: React.FC;
- Separator: React.FC;
-}
-
-const Summary: SummaryComponent = ({ style, ...props }) => {
+const Summary = ({ style, ...props }) => {
const styles = useGetStyles();
return ;
};
-
-const SummaryRow: React.FC = ({ style, end, last, ...props }) => {
+const SummaryRow = ({ style, end, last, ...props }) => {
const styles = useGetStyles();
return (
= ({ style, end, last, ...props }) =
/>
);
};
-
-const SummaryCol: React.FC = ({ style, end, ...props }) => {
+const SummaryCol = ({ style, end, ...props }) => {
const styles = useGetStyles();
return ;
};
-
-const SummarySeparator: React.FC = ({ style, ...props }) => {
+const SummarySeparator = ({ style, ...props }) => {
const styles = useGetStyles();
return ;
};
@@ -89,5 +65,34 @@ const SummarySeparator: React.FC = ({ style, ...props })
Summary.Row = SummaryRow;
Summary.Col = SummaryCol;
Summary.Separator = SummarySeparator;
-
export default Summary;
+
+/**
+ * Any other external style defined in props will be applied
+ */
+const stylePropType = PropTypes.oneOfType([PropTypes.object, PropTypes.array]);
+
+Summary.propTypes = {
+ style: stylePropType,
+};
+SummaryRow.propTypes = {
+ style: stylePropType,
+ /**
+ * Aligns content to the end of the row
+ */
+ end: PropTypes.bool,
+ /**
+ * Add style to the last row of the summary
+ */
+ last: PropTypes.bool,
+};
+SummaryCol.propTypes = {
+ style: stylePropType,
+ /**
+ * Aligns content to the end of the row
+ */
+ end: PropTypes.bool,
+};
+SummarySeparator.propTypes = {
+ style: stylePropType,
+};
diff --git a/app/components/Nav/Main/MainNavigator.js b/app/components/Nav/Main/MainNavigator.js
index dd7342adc58..b73c245d6cf 100644
--- a/app/components/Nav/Main/MainNavigator.js
+++ b/app/components/Nav/Main/MainNavigator.js
@@ -89,7 +89,7 @@ import NftDetails from '../../Views/NftDetails';
import NftDetailsFullImage from '../../Views/NftDetails/NFtDetailsFullImage';
import AccountPermissions from '../../../components/Views/AccountPermissions';
import { AccountPermissionsScreens } from '../../../components/Views/AccountPermissions/AccountPermissions.types';
-import { StakeModalStack, StakeScreenStack } from '../../UI/Stake/routes';
+import StakeInputView from '../../UI/Stake/Views/InputView/StakeInputView';
const Stack = createStackNavigator();
const Tab = createBottomTabNavigator();
@@ -694,6 +694,16 @@ const Swaps = () => (
);
+const Stake = () => (
+
+
+
+);
+
const SetPasswordFlow = () => (
(
{() => }
-
-
+
{
return (
-
{
const [showDeprecatedAlert, setShowDeprecatedAlert] = useState(true);
const { colors } = useTheme();
const styles = createStyles(colors);
+
const backgroundMode = useRef(false);
const locale = useRef(I18n.locale);
const removeConnectionStatusListener = useRef();
const removeNotVisibleNotifications = props.removeNotVisibleNotifications;
- useNotificationHandler(props.navigation);
+
useEnableAutomaticSecurityChecks();
useMinimumVersions();
-
-
-
useEffect(() => {
if (DEPRECATED_NETWORKS.includes(props.chainId)) {
setShowDeprecatedAlert(true);
@@ -268,9 +267,24 @@ const Main = (props) => {
initForceReload();
return;
}
-
});
+ const bootstrapAndroidInitialNotification = useCallback(async () => {
+ if (Device.isAndroid()) {
+ const initialNotification = await notifee.getInitialNotification();
+
+ if (
+ initialNotification?.data?.action === 'tx' &&
+ initialNotification.data.id
+ ) {
+ NotificationManager.setTransactionToView(initialNotification.data.id);
+ props.navigation.navigate(Routes.TRANSACTIONS_VIEW);
+ }
+ }
+ }, [props.navigation]);
+
+ useNotificationHandler(bootstrapAndroidInitialNotification, props.navigation);
+
// Remove all notifications that aren't visible
useEffect(() => {
removeNotVisibleNotifications();
diff --git a/app/components/UI/AccountSelectorList/AccountSelector.test.tsx b/app/components/UI/AccountSelectorList/AccountSelector.test.tsx
index 306c88825c4..0cb8daa6c9b 100644
--- a/app/components/UI/AccountSelectorList/AccountSelector.test.tsx
+++ b/app/components/UI/AccountSelectorList/AccountSelector.test.tsx
@@ -8,12 +8,7 @@ import { View } from 'react-native';
import { ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID } from '../../../../wdio/screen-objects/testIDs/Components/AccountListComponent.testIds';
import { backgroundState } from '../../../util/test/initial-root-state';
import { regex } from '../../../../app/util/regex';
-import {
- createMockAccountsControllerState,
- createMockAccountsControllerStateWithSnap,
- MOCK_ADDRESS_1,
- MOCK_ADDRESS_2,
-} from '../../../util/test/accountsControllerTestUtils';
+import { createMockAccountsControllerState } from '../../../util/test/accountsControllerTestUtils';
import { mockNetworkState } from '../../../util/test/network';
import { CHAIN_IDS } from '@metamask/transaction-controller';
@@ -205,28 +200,4 @@ describe('AccountSelectorList', () => {
expect(within(accountNameItems[1]).getByText('Account 2')).toBeDefined();
});
});
- it('renders "Snaps (beta)" tag for Snap accounts', async () => {
- const mockAccountsWithSnap = createMockAccountsControllerStateWithSnap([
- MOCK_ADDRESS_1,
- MOCK_ADDRESS_2,
- ]);
-
- const stateWithSnapAccount = {
- ...initialState,
- engine: {
- ...initialState.engine,
- backgroundState: {
- ...initialState.engine.backgroundState,
- AccountsController: mockAccountsWithSnap,
- },
- },
- };
-
- const { queryByText } = renderComponent(stateWithSnapAccount);
-
- await waitFor(async () => {
- const snapTag = await queryByText('Snaps (beta)');
- expect(snapTag).toBeDefined();
- });
- });
});
diff --git a/app/components/UI/AccountSelectorList/__snapshots__/AccountSelector.test.tsx.snap b/app/components/UI/AccountSelectorList/__snapshots__/AccountSelector.test.tsx.snap
index 49c9d6e96b1..da19df64fb1 100644
--- a/app/components/UI/AccountSelectorList/__snapshots__/AccountSelector.test.tsx.snap
+++ b/app/components/UI/AccountSelectorList/__snapshots__/AccountSelector.test.tsx.snap
@@ -65,6 +65,7 @@ exports[`AccountSelectorList renders all accounts with balances 1`] = `
"backgroundColor": "#ffffff",
"borderRadius": 4,
"opacity": 1,
+ "padding": 16,
"position": "relative",
}
}
@@ -75,243 +76,236 @@ exports[`AccountSelectorList renders all accounts with balances 1`] = `
accessible={true}
style={
{
- "padding": 16,
+ "alignItems": "center",
+ "flexDirection": "row",
+ "padding": 0,
}
}
>
-
-
-
-
-
-
+
+
-
-
-
+ }
+ height={32}
+ matrix={
+ [
+ 0.7046342099635947,
+ -0.7095707365365209,
+ 0.7095707365365209,
+ 0.7046342099635947,
+ -25.225718686778755,
+ -4.611026307883787,
+ ]
+ }
+ propList={
+ [
+ "fill",
+ ]
+ }
+ width={32}
+ x={0}
+ y={0}
+ />
+
+
+
+
+
+ Account 1
+
+
+ 0xC495...D272
+
+
+
- Account 1
-
-
- 0xC495...D272
-
-
-
-
-
- $3200.00
+ $3200.00
1 ETH
-
-
+
@@ -358,6 +352,7 @@ exports[`AccountSelectorList renders all accounts with balances 1`] = `
"backgroundColor": "#ffffff",
"borderRadius": 4,
"opacity": 1,
+ "padding": 16,
"position": "relative",
}
}
@@ -368,243 +363,236 @@ exports[`AccountSelectorList renders all accounts with balances 1`] = `
accessible={true}
style={
{
- "padding": 16,
+ "alignItems": "center",
+ "flexDirection": "row",
+ "padding": 0,
}
}
>
-
-
-
-
-
-
+
+
-
-
-
+ }
+ height={32}
+ matrix={
+ [
+ 0.6704266189587993,
+ -0.7419758409756162,
+ 0.7419758409756162,
+ 0.6704266189587993,
+ 8.152366664413217,
+ -0.7899246956676649,
+ ]
+ }
+ propList={
+ [
+ "fill",
+ ]
+ }
+ width={32}
+ x={0}
+ y={0}
+ />
+
+
+
+
+
+ Account 2
+
+
+ 0xd018...78E7
+
+
+
- Account 2
-
-
- 0xd018...78E7
-
-
-
-
-
- $6400.00
+ $6400.00
2 ETH
-
-
+
@@ -681,6 +669,7 @@ exports[`AccountSelectorList renders all accounts with right accessory 1`] = `
"backgroundColor": "#ffffff",
"borderRadius": 4,
"opacity": 1,
+ "padding": 16,
"position": "relative",
}
}
@@ -691,222 +680,215 @@ exports[`AccountSelectorList renders all accounts with right accessory 1`] = `
accessible={true}
style={
{
- "padding": 16,
+ "alignItems": "center",
+ "flexDirection": "row",
+ "padding": 0,
}
}
>
-
-
-
-
-
-
+
+
-
-
-
+ }
+ height={32}
+ matrix={
+ [
+ 0.7046342099635947,
+ -0.7095707365365209,
+ 0.7095707365365209,
+ 0.7046342099635947,
+ -25.225718686778755,
+ -4.611026307883787,
+ ]
+ }
+ propList={
+ [
+ "fill",
+ ]
+ }
+ width={32}
+ x={0}
+ y={0}
+ />
+
+
-
+
+
-
- Account 1
-
-
- 0xC495...D272
-
-
-
+
-
- 0xC4955C0d639D99699Bfd7Ec54d9FaFEe40e4D272 - Account 1
-
+ 0xC495...D272
+
+
+
+
+ 0xC4955C0d639D99699Bfd7Ec54d9FaFEe40e4D272 - Account 1
@@ -927,6 +909,7 @@ exports[`AccountSelectorList renders all accounts with right accessory 1`] = `
"backgroundColor": "#ffffff",
"borderRadius": 4,
"opacity": 1,
+ "padding": 16,
"position": "relative",
}
}
@@ -937,222 +920,215 @@ exports[`AccountSelectorList renders all accounts with right accessory 1`] = `
accessible={true}
style={
{
- "padding": 16,
+ "alignItems": "center",
+ "flexDirection": "row",
+ "padding": 0,
}
}
>
-
-
-
-
-
-
+
+
-
-
-
+ }
+ height={32}
+ matrix={
+ [
+ 0.6704266189587993,
+ -0.7419758409756162,
+ 0.7419758409756162,
+ 0.6704266189587993,
+ 8.152366664413217,
+ -0.7899246956676649,
+ ]
+ }
+ propList={
+ [
+ "fill",
+ ]
+ }
+ width={32}
+ x={0}
+ y={0}
+ />
+
+
-
+
+
-
- Account 2
-
-
- 0xd018...78E7
-
-
-
+
-
- 0xd018538C87232FF95acbCe4870629b75640a78E7 - Account 2
-
+ 0xd018...78E7
+
+
+
+
+ 0xd018538C87232FF95acbCe4870629b75640a78E7 - Account 2
@@ -1228,6 +1204,7 @@ exports[`AccountSelectorList renders correctly 1`] = `
"backgroundColor": "#ffffff",
"borderRadius": 4,
"opacity": 1,
+ "padding": 16,
"position": "relative",
}
}
@@ -1238,243 +1215,236 @@ exports[`AccountSelectorList renders correctly 1`] = `
accessible={true}
style={
{
- "padding": 16,
+ "alignItems": "center",
+ "flexDirection": "row",
+ "padding": 0,
}
}
>
-
-
-
-
-
-
+
+
-
-
-
+ }
+ height={32}
+ matrix={
+ [
+ 0.7046342099635947,
+ -0.7095707365365209,
+ 0.7095707365365209,
+ 0.7046342099635947,
+ -25.225718686778755,
+ -4.611026307883787,
+ ]
+ }
+ propList={
+ [
+ "fill",
+ ]
+ }
+ width={32}
+ x={0}
+ y={0}
+ />
+
+
+
+
+
+ Account 1
+
+
+ 0xC495...D272
+
+
+
- Account 1
-
-
- 0xC495...D272
-
-
-
-
-
- $3200.00
+ $3200.00
1 ETH
-
-
+
@@ -1521,6 +1491,7 @@ exports[`AccountSelectorList renders correctly 1`] = `
"backgroundColor": "#ffffff",
"borderRadius": 4,
"opacity": 1,
+ "padding": 16,
"position": "relative",
}
}
@@ -1531,243 +1502,236 @@ exports[`AccountSelectorList renders correctly 1`] = `
accessible={true}
style={
{
- "padding": 16,
+ "alignItems": "center",
+ "flexDirection": "row",
+ "padding": 0,
}
}
>
-
-
-
-
-
-
+
+
-
-
-
+ }
+ height={32}
+ matrix={
+ [
+ 0.6704266189587993,
+ -0.7419758409756162,
+ 0.7419758409756162,
+ 0.6704266189587993,
+ 8.152366664413217,
+ -0.7899246956676649,
+ ]
+ }
+ propList={
+ [
+ "fill",
+ ]
+ }
+ width={32}
+ x={0}
+ y={0}
+ />
+
+
+
+
+
+ Account 2
+
+
+ 0xd018...78E7
+
+
+
- Account 2
-
-
- 0xd018...78E7
-
-
-
-
-
- $6400.00
+ $6400.00
2 ETH
-
-
+
@@ -1840,6 +1804,7 @@ exports[`AccountSelectorList should render all accounts but only the balance for
"backgroundColor": "#ffffff",
"borderRadius": 4,
"opacity": 1,
+ "padding": 16,
"position": "relative",
}
}
@@ -1850,127 +1815,120 @@ exports[`AccountSelectorList should render all accounts but only the balance for
accessible={true}
style={
{
- "padding": 16,
+ "alignItems": "center",
+ "flexDirection": "row",
+ "padding": 0,
}
}
>
-
-
+
+ Account 1
+
+
-
+ }
+ >
+ 0xC495...D272
+
+
+
- Account 1
-
-
- 0xC495...D272
-
-
-
-
-
- $3200.00
+ $3200.00
1 ETH
-
-
+
@@ -2017,6 +1975,7 @@ exports[`AccountSelectorList should render all accounts but only the balance for
"backgroundColor": "#ffffff",
"borderRadius": 4,
"opacity": 1,
+ "padding": 16,
"position": "relative",
}
}
@@ -2027,94 +1986,87 @@ exports[`AccountSelectorList should render all accounts but only the balance for
accessible={true}
style={
{
- "padding": 16,
+ "alignItems": "center",
+ "flexDirection": "row",
+ "padding": 0,
}
}
>
-
-
-
-
-
+
+
+
- Account 2
-
-
+ Account 2
+
+
- 0xd018...78E7
-
-
+ }
+ >
+ 0xd018...78E7
+
diff --git a/app/components/UI/AddCustomCollectible/index.tsx b/app/components/UI/AddCustomCollectible/index.tsx
index be364abd6c8..a0bf94fd374 100644
--- a/app/components/UI/AddCustomCollectible/index.tsx
+++ b/app/components/UI/AddCustomCollectible/index.tsx
@@ -6,6 +6,7 @@ import {
TextInput,
View,
StyleSheet,
+ Platform,
} from 'react-native';
import { fontStyles } from '../../../styles/common';
import Engine from '../../../core/Engine';
@@ -17,7 +18,14 @@ import Device from '../../../util/device';
import { MetaMetricsEvents } from '../../../core/Analytics';
import { useTheme } from '../../../util/theme';
-import { NFTImportScreenSelectorsIDs } from '../../../../e2e/selectors/wallet/ImportNFTView.selectors';
+import { CUSTOM_TOKEN_CONTAINER_ID } from '../../../../wdio/screen-objects/testIDs/Screens/AddCustomToken.testIds';
+import generateTestId from '../../../../wdio/utils/generateTestId';
+import {
+ NFT_ADDRESS_INPUT_BOX_ID,
+ NFT_IDENTIFIER_WARNING_MESSAGE_ID,
+ NFT_ADDRESS_WARNING_MESSAGE_ID,
+ NFT_IDENTIFIER_INPUT_BOX_ID,
+} from '../../../../wdio/screen-objects/testIDs/Screens/NFTImportScreen.testIds';
import { selectChainId } from '../../../selectors/networkController';
import { selectSelectedInternalAccountChecksummedAddress } from '../../../selectors/accountsController';
import { getDecimalChainId } from '../../../util/networks';
@@ -225,7 +233,7 @@ const AddCustomCollectible = ({
return (
{warningAddress}
@@ -274,7 +282,7 @@ const AddCustomCollectible = ({
keyboardType="numeric"
onChangeText={onTokenIdChange}
onBlur={validateCustomCollectibleTokenId}
- testID={NFTImportScreenSelectorsIDs.IDENTIFIER_INPUT_BOX}
+ {...generateTestId(Platform, NFT_IDENTIFIER_INPUT_BOX_ID)}
ref={assetTokenIdInput}
onSubmitEditing={addNft}
returnKeyType={'done'}
@@ -284,7 +292,7 @@ const AddCustomCollectible = ({
/>
{warningTokenId}
diff --git a/app/components/UI/AddCustomToken/__snapshots__/index.test.tsx.snap b/app/components/UI/AddCustomToken/__snapshots__/index.test.tsx.snap
index 4ad291a7d08..e0596fa1cff 100644
--- a/app/components/UI/AddCustomToken/__snapshots__/index.test.tsx.snap
+++ b/app/components/UI/AddCustomToken/__snapshots__/index.test.tsx.snap
@@ -8,6 +8,7 @@ exports[`AddCustomToken render matches previous snapshot 1`] = `
"flex": 1,
}
}
+ testID="add-custom-token-screen"
>
@@ -225,7 +226,7 @@ exports[`AddCustomToken render matches previous snapshot 1`] = `
"width": "90%",
}
}
- testID="token-import-next-button"
+ testID="next-button-custom-import"
>
+
{this.renderBanner()}
@@ -529,14 +540,14 @@ class AddCustomToken extends PureComponent {
onBlur={() => {
this.handleBlurAddress();
}}
- testID={ImportTokenViewSelectorsIDs.ADDRESS_INPUT}
+ {...generateTestId(Platform, TOKEN_ADDRESS_INPUT_BOX_ID)}
onSubmitEditing={this.jumpToAssetSymbol}
returnKeyType={'next'}
keyboardAppearance={themeAppearance}
/>
{this.state.warningAddress}
@@ -554,7 +565,7 @@ class AddCustomToken extends PureComponent {
value={this.state.symbol}
onChangeText={this.onSymbolChange}
onBlur={this.validateCustomTokenSymbol}
- testID={ImportTokenViewSelectorsIDs.SYMBOL_INPUT}
+ {...generateTestId(Platform, TOKEN_ADDRESS_SYMBOL_ID)}
ref={this.assetSymbolInput}
onSubmitEditing={this.jumpToAssetPrecision}
returnKeyType={'next'}
@@ -579,7 +590,7 @@ class AddCustomToken extends PureComponent {
placeholderTextColor={colors.text.muted}
onChangeText={this.onDecimalsChange}
onBlur={this.validateCustomTokenDecimals}
- testID={ImportTokenViewSelectorsIDs.DECIMAL_INPUT}
+ {...generateTestId(Platform, NFT_IDENTIFIER_INPUT_BOX_ID)}
ref={this.assetPrecisionInput}
onSubmitEditing={this.addToken}
returnKeyType={'done'}
@@ -590,7 +601,10 @@ class AddCustomToken extends PureComponent {
{this.state.warningDecimals ? (
{this.state.warningDecimals}{' '}
diff --git a/app/components/UI/AddressCopy/AddressCopy.styles.ts b/app/components/UI/AddressCopy/AddressCopy.styles.ts
index 089c48d5136..5a79e70438d 100644
--- a/app/components/UI/AddressCopy/AddressCopy.styles.ts
+++ b/app/components/UI/AddressCopy/AddressCopy.styles.ts
@@ -7,18 +7,14 @@ const styleSheet = (params: { theme: Theme }) => {
const { colors } = theme;
return StyleSheet.create({
- address: {
- flexDirection: 'row',
- alignItems: 'center',
- },
+ address: { flexDirection: 'row' },
copyButton: {
flexDirection: 'row',
alignItems: 'center',
backgroundColor: colors.primary.muted,
borderRadius: 20,
- paddingHorizontal: 12,
- padding: 4,
- marginLeft: 12,
+ paddingHorizontal: 8,
+ marginLeft: 8,
},
icon: { marginLeft: 4 },
});
diff --git a/app/components/UI/AddressCopy/AddressCopy.tsx b/app/components/UI/AddressCopy/AddressCopy.tsx
index d295c5f75ad..17f8dbd1550 100644
--- a/app/components/UI/AddressCopy/AddressCopy.tsx
+++ b/app/components/UI/AddressCopy/AddressCopy.tsx
@@ -79,7 +79,7 @@ const AddressCopy = ({ formatAddressType = 'full' }: AddressCopyProps) => {
>
{selectedInternalAccount
diff --git a/app/components/UI/ApprovalTagUrl/ApprovalTagUrl.tsx b/app/components/UI/ApprovalTagUrl/ApprovalTagUrl.tsx
index e7980f2848d..c66a2390c3d 100644
--- a/app/components/UI/ApprovalTagUrl/ApprovalTagUrl.tsx
+++ b/app/components/UI/ApprovalTagUrl/ApprovalTagUrl.tsx
@@ -4,12 +4,12 @@ import { useSelector } from 'react-redux';
import { strings } from '../../../../locales/i18n';
import TagUrl from '../../../component-library/components/Tags/TagUrl';
-import { useStyles } from '../../../component-library/hooks';
import AppConstants from '../../../core/AppConstants';
-import { selectInternalAccounts } from '../../../selectors/accountsController';
import { selectAccountsByChainId } from '../../../selectors/accountTrackerController';
import { prefixUrlWithProtocol } from '../../../util/browser';
import useFavicon from '../../hooks/useFavicon/useFavicon';
+import { selectInternalAccounts } from '../../../selectors/accountsController';
+import { useStyles } from '../../../component-library/hooks';
import stylesheet from './ApprovalTagUrl.styles';
const { ORIGIN_DEEPLINK, ORIGIN_QR_CODE } = AppConstants.DEEPLINKS;
@@ -51,14 +51,12 @@ const ApprovalTagUrl = ({
const domainTitle = useMemo(() => {
let title = '';
- if (url || currentEnsName || origin) {
- title = prefixUrlWithProtocol(currentEnsName || origin || url);
- } else {
- title = '';
+ if (url || currentEnsName) {
+ title = prefixUrlWithProtocol(currentEnsName || url || '');
}
return title;
- }, [currentEnsName, origin, url]);
+ }, [currentEnsName, url]);
const faviconSource = useFavicon(origin as string) as
| { uri: string }
diff --git a/app/components/UI/AssetList/index.js b/app/components/UI/AssetList/index.js
index f5f736236de..c5c89f3709d 100644
--- a/app/components/UI/AssetList/index.js
+++ b/app/components/UI/AssetList/index.js
@@ -6,6 +6,7 @@ import StyledButton from '../StyledButton'; // eslint-disable-line import/no-un
import AssetIcon from '../AssetIcon';
import { fontStyles } from '../../../styles/common';
import Text from '../../Base/Text';
+import { ImportTokenViewSelectorsIDs } from '../../../../e2e/selectors/ImportTokenView.selectors';
const styles = StyleSheet.create({
rowWrapper: {
@@ -79,6 +80,7 @@ export default class AssetList extends PureComponent {
containerStyle={styles.item}
onPress={() => handleSelectAsset(searchResults[i])} // eslint-disable-line
key={i}
+ testID={ImportTokenViewSelectorsIDs.CONTAINER}
>
diff --git a/app/components/UI/AssetOverview/Balance/Balance.styles.tsx b/app/components/UI/AssetOverview/Balance/Balance.styles.tsx
index 335718d5c39..ce76a5f26ea 100644
--- a/app/components/UI/AssetOverview/Balance/Balance.styles.tsx
+++ b/app/components/UI/AssetOverview/Balance/Balance.styles.tsx
@@ -24,7 +24,9 @@ const styleSheet = (params: { theme: Theme }) => {
overflow: 'hidden',
},
title: {
- paddingVertical: 4,
+ ...typography.sHeadingSM,
+ marginVertical: 0,
+ paddingVertical: 8,
paddingHorizontal: 15,
} as TextStyle,
text: {
diff --git a/app/components/UI/AssetOverview/Balance/Balance.tsx b/app/components/UI/AssetOverview/Balance/Balance.tsx
index 02c89071051..75fe3d4efac 100644
--- a/app/components/UI/AssetOverview/Balance/Balance.tsx
+++ b/app/components/UI/AssetOverview/Balance/Balance.tsx
@@ -1,6 +1,7 @@
import React from 'react';
import { View } from 'react-native';
import { strings } from '../../../../../locales/i18n';
+import Title from '../../../Base/Title';
import { useStyles } from '../../../../component-library/hooks';
import styleSheet from './Balance.styles';
import AssetElement from '../../AssetElement';
@@ -25,9 +26,6 @@ import Text, {
} from '../../../../component-library/components/Texts/Text';
import { TokenI } from '../../Tokens/types';
import { useNavigation } from '@react-navigation/native';
-import { isPooledStakingFeatureEnabled } from '../../Stake/constants';
-import StakingBalance from '../../Stake/components/StakingBalance/StakingBalance';
-
interface BalanceProps {
asset: TokenI;
mainBalance: string;
@@ -55,9 +53,9 @@ const Balance = ({ asset, mainBalance, secondaryBalance }: BalanceProps) => {
return (
-
+
{strings('asset_overview.your_balance')}
- </Text>
+
{
{asset.name || asset.symbol}
- {isPooledStakingFeatureEnabled() && asset?.isETH && }
);
};
diff --git a/app/components/UI/AssetOverview/Balance/__snapshots__/index.test.tsx.snap b/app/components/UI/AssetOverview/Balance/__snapshots__/index.test.tsx.snap
index d233e8e44fd..af6fcda4d9e 100644
--- a/app/components/UI/AssetOverview/Balance/__snapshots__/index.test.tsx.snap
+++ b/app/components/UI/AssetOverview/Balance/__snapshots__/index.test.tsx.snap
@@ -9,18 +9,60 @@ exports[`Balance should render correctly with a fiat balance 1`] = `
}
>
Your balance
@@ -237,18 +279,60 @@ exports[`Balance should render correctly without a fiat balance 1`] = `
}
>
Your balance
diff --git a/app/components/UI/AssetOverview/ChartNavigationButton/ChartNavigationButton.styles.tsx b/app/components/UI/AssetOverview/ChartNavigationButton/ChartNavigationButton.styles.tsx
index ae8fdabdd06..d468e7e2502 100644
--- a/app/components/UI/AssetOverview/ChartNavigationButton/ChartNavigationButton.styles.tsx
+++ b/app/components/UI/AssetOverview/ChartNavigationButton/ChartNavigationButton.styles.tsx
@@ -15,7 +15,7 @@ const styleSheet = (params: {
return StyleSheet.create({
button: {
backgroundColor: selected
- ? colors.background.pressed
+ ? colors.primary.default
: colors.background.default,
borderRadius: 40,
paddingVertical: 2,
@@ -27,6 +27,7 @@ const styleSheet = (params: {
},
label: {
letterSpacing: 3,
+ color: selected ? colors.background.default : colors.primary.default,
textAlign: 'center',
} as TextStyle,
});
diff --git a/app/components/UI/AssetOverview/ChartNavigationButton/ChartNavigationButton.tsx b/app/components/UI/AssetOverview/ChartNavigationButton/ChartNavigationButton.tsx
index cc33cec08c8..7aae8909651 100644
--- a/app/components/UI/AssetOverview/ChartNavigationButton/ChartNavigationButton.tsx
+++ b/app/components/UI/AssetOverview/ChartNavigationButton/ChartNavigationButton.tsx
@@ -2,7 +2,6 @@ import React from 'react';
import { TouchableOpacity } from 'react-native';
import { useStyles } from '../../../../component-library/hooks';
import Text, {
- TextColor,
TextVariant,
} from '../../../../component-library/components/Texts/Text';
import styleSheet from './ChartNavigationButton.styles';
@@ -21,11 +20,7 @@ const ChartNavigationButton = ({
const { styles } = useStyles(styleSheet, { selected });
return (
-
+
{label}
diff --git a/app/components/UI/AssetOverview/Price/Price.styles.tsx b/app/components/UI/AssetOverview/Price/Price.styles.tsx
index 5510e7fd774..0330cf4e6d0 100644
--- a/app/components/UI/AssetOverview/Price/Price.styles.tsx
+++ b/app/components/UI/AssetOverview/Price/Price.styles.tsx
@@ -11,22 +11,33 @@ const styleSheet = (params: {
theme,
vars: { priceDiff },
} = params;
- const { colors } = theme;
+ const { colors, typography } = theme;
return StyleSheet.create({
wrapper: {
paddingHorizontal: 16,
},
+ name: {
+ fontWeight: '500',
+ } as TextStyle,
+ price: {
+ ...typography.lHeadingLG,
+ } as TextStyle,
priceDiff: {
+ ...typography.lBodyMDMedium,
color:
priceDiff > 0
? colors.success.default
: priceDiff < 0
? colors.error.default
: colors.text.alternative,
+ lineHeight: 22,
} as TextStyle,
priceDiffIcon: {
marginTop: 10,
},
+ priceDiffDateText: {
+ ...typography.lBodyMDMedium,
+ } as TextStyle,
loadingPrice: {
paddingTop: 8,
},
diff --git a/app/components/UI/AssetOverview/Price/Price.tsx b/app/components/UI/AssetOverview/Price/Price.tsx
index f297a40115f..694f2215b75 100644
--- a/app/components/UI/AssetOverview/Price/Price.tsx
+++ b/app/components/UI/AssetOverview/Price/Price.tsx
@@ -11,9 +11,9 @@ import { useStyles } from '../../../../component-library/hooks';
import { toDateFormat } from '../../../../util/date';
import { addCurrencySymbol } from '../../../../util/number';
import Text, {
- TextColor,
TextVariant,
} from '../../../../component-library/components/Texts/Text';
+import Title from '../../../Base/Title';
import PriceChart from '../PriceChart/PriceChart';
import { distributeDataPoints } from '../PriceChart/utils';
import styleSheet from './Price.styles';
@@ -80,17 +80,14 @@ const Price = ({
<>
{asset.name ? (
-
+
{asset.name} ({asset.symbol})
) : (
- {asset.symbol}
+ {asset.symbol}
)}
{!isNaN(price) && (
-
+
{isLoading ? (
<View style={styles.loadingPrice}>
<SkeletonPlaceholder>
@@ -104,7 +101,7 @@ const Price = ({
) : (
addCurrencySymbol(price, currentCurrency, true)
)}
- </Text>
+
)}
{isLoading ? (
@@ -118,7 +115,7 @@ const Price = ({
) : distributedPriceData.length > 0 ? (
-
+
{
0 ? '+' : ''}
{diff === 0 ? '0' : ((diff / comparePrice) * 100).toFixed(2)}
- %){' '}
-
- {date}
-
+ %) {date}
) : null}
diff --git a/app/components/UI/AssetOverview/PriceChart/PriceChart.tsx b/app/components/UI/AssetOverview/PriceChart/PriceChart.tsx
index 2af05649ef6..aeb34cc7a93 100644
--- a/app/components/UI/AssetOverview/PriceChart/PriceChart.tsx
+++ b/app/components/UI/AssetOverview/PriceChart/PriceChart.tsx
@@ -69,9 +69,9 @@ const PriceChart = ({
const chartColor =
priceDiff > 0
- ? theme.colors.primary.default
+ ? theme.colors.success.default
: priceDiff < 0
- ? theme.colors.primary.default
+ ? theme.colors.error.default
: theme.colors.text.alternative;
const apx = (size = 0) => {
diff --git a/app/components/UI/AssetOverview/StakingEarnings/StakingEarnings.styles.tsx b/app/components/UI/AssetOverview/StakingEarnings/StakingEarnings.styles.tsx
index e5961497522..b9fc494e5ca 100644
--- a/app/components/UI/AssetOverview/StakingEarnings/StakingEarnings.styles.tsx
+++ b/app/components/UI/AssetOverview/StakingEarnings/StakingEarnings.styles.tsx
@@ -3,13 +3,14 @@ import { StyleSheet, TextStyle } from 'react-native';
const styleSheet = (params: { theme: Theme }) => {
const { theme } = params;
- const { colors } = theme;
+ const { colors, typography } = theme;
return StyleSheet.create({
stakingEarningsContainer: {
paddingTop: 16,
},
title: {
+ ...typography.sHeadingSM,
paddingBottom: 8,
} as TextStyle,
keyValueRow: {
diff --git a/app/components/UI/AssetOverview/StakingEarnings/__snapshots__/StakingEarnings.test.tsx.snap b/app/components/UI/AssetOverview/StakingEarnings/__snapshots__/StakingEarnings.test.tsx.snap
index 3f9bd60d677..766fc24aac4 100644
--- a/app/components/UI/AssetOverview/StakingEarnings/__snapshots__/StakingEarnings.test.tsx.snap
+++ b/app/components/UI/AssetOverview/StakingEarnings/__snapshots__/StakingEarnings.test.tsx.snap
@@ -9,17 +9,58 @@ exports[`Staking Earnings should render correctly 1`] = `
}
>
Your earnings
diff --git a/app/components/UI/AssetOverview/StakingEarnings/index.tsx b/app/components/UI/AssetOverview/StakingEarnings/index.tsx
index d9538aaa50a..99bb62812ab 100644
--- a/app/components/UI/AssetOverview/StakingEarnings/index.tsx
+++ b/app/components/UI/AssetOverview/StakingEarnings/index.tsx
@@ -16,6 +16,7 @@ import ButtonIcon, {
import useTooltipModal from '../../../../components/hooks/useTooltipModal';
import { strings } from '../../../../../locales/i18n';
import { isPooledStakingFeatureEnabled } from '../../Stake/constants';
+import Title from '../../../Base/Title';
// TODO: Remove mock data when connecting component to backend.
const MOCK_DATA = {
@@ -49,9 +50,7 @@ const StakingEarnings = () => {
return (
-
- {strings('stake.your_earnings')}
-
+ {strings('stake.your_earnings')}
{/* Annual Rate */}
diff --git a/app/components/UI/AssetOverview/TokenDetails/MarketDetailsList/MarketDetailsList.tsx b/app/components/UI/AssetOverview/TokenDetails/MarketDetailsList/MarketDetailsList.tsx
index 6edd8fd5ca2..ffd3713470e 100644
--- a/app/components/UI/AssetOverview/TokenDetails/MarketDetailsList/MarketDetailsList.tsx
+++ b/app/components/UI/AssetOverview/TokenDetails/MarketDetailsList/MarketDetailsList.tsx
@@ -2,12 +2,10 @@ import React from 'react';
import { View } from 'react-native';
import { strings } from '../../../../../../locales/i18n';
import { useStyles } from '../../../../../component-library/hooks';
+import Title from '../../../../Base/Title';
import styleSheet from '../TokenDetails.styles';
import { MarketDetails } from '../TokenDetails';
import TokenDetailsListItem from '../TokenDetailsListItem';
-import Text, {
- TextVariant,
-} from '../../../../../component-library/components/Texts/Text';
interface MarketDetailsListProps {
marketDetails: MarketDetails;
@@ -20,9 +18,7 @@ const MarketDetailsList: React.FC = ({
return (
-
- {strings('token.market_details')}
-
+ {strings('token.market_details')}
{marketDetails.marketCap && (
Market details
diff --git a/app/components/UI/AssetOverview/TokenDetails/TokenDetails.styles.tsx b/app/components/UI/AssetOverview/TokenDetails/TokenDetails.styles.tsx
index 2d4b7023f4e..7a087b99206 100644
--- a/app/components/UI/AssetOverview/TokenDetails/TokenDetails.styles.tsx
+++ b/app/components/UI/AssetOverview/TokenDetails/TokenDetails.styles.tsx
@@ -3,7 +3,7 @@ import { StyleSheet, TextStyle } from 'react-native';
const styleSheet = (params: { theme: Theme }) => {
const { theme } = params;
- const { colors } = theme;
+ const { typography, colors } = theme;
return StyleSheet.create({
tokenDetailsContainer: {
marginTop: 24,
@@ -13,6 +13,8 @@ const styleSheet = (params: { theme: Theme }) => {
paddingVertical: 4,
},
title: {
+ ...typography.sHeadingSM,
+ marginVertical: 0,
paddingVertical: 8,
} as TextStyle,
icon: { marginLeft: 4 },
diff --git a/app/components/UI/AssetOverview/TokenDetails/TokenDetailsList/TokenDetailsList.tsx b/app/components/UI/AssetOverview/TokenDetails/TokenDetailsList/TokenDetailsList.tsx
index b218361c5ff..17622c974ce 100644
--- a/app/components/UI/AssetOverview/TokenDetails/TokenDetailsList/TokenDetailsList.tsx
+++ b/app/components/UI/AssetOverview/TokenDetails/TokenDetailsList/TokenDetailsList.tsx
@@ -8,6 +8,7 @@ import Text, {
TextColor,
TextVariant,
} from '../../../../../component-library/components/Texts/Text';
+import Title from '../../../../Base/Title';
import styleSheet from '../TokenDetails.styles';
import Icon, {
IconColor,
@@ -48,9 +49,7 @@ const TokenDetailsList: React.FC = ({
return (
-
- {strings('token.token_details')}
-
+ {strings('token.token_details')}
{tokenDetails.contractAddress && (
Token details
diff --git a/app/components/UI/AssetOverview/TokenDetails/__snapshots__/TokenDetails.test.tsx.snap b/app/components/UI/AssetOverview/TokenDetails/__snapshots__/TokenDetails.test.tsx.snap
index 1fc8c179d6c..677b5a82edd 100644
--- a/app/components/UI/AssetOverview/TokenDetails/__snapshots__/TokenDetails.test.tsx.snap
+++ b/app/components/UI/AssetOverview/TokenDetails/__snapshots__/TokenDetails.test.tsx.snap
@@ -11,17 +11,59 @@ exports[`TokenDetails should render correctly 1`] = `
>
Token details
@@ -195,17 +237,59 @@ exports[`TokenDetails should render correctly 1`] = `
Market details
diff --git a/app/components/UI/AssetOverview/__snapshots__/AssetOverview.test.tsx.snap b/app/components/UI/AssetOverview/__snapshots__/AssetOverview.test.tsx.snap
index 5ec60e73b6f..28af7970a2c 100644
--- a/app/components/UI/AssetOverview/__snapshots__/AssetOverview.test.tsx.snap
+++ b/app/components/UI/AssetOverview/__snapshots__/AssetOverview.test.tsx.snap
@@ -21,12 +21,12 @@ exports[`AssetOverview should render correctly 1`] = `
accessibilityRole="text"
style={
{
- "color": "#6a737d",
+ "color": "#141618",
"fontFamily": "EuclidCircularB-Medium",
- "fontSize": 14,
+ "fontSize": 18,
"fontWeight": "500",
"letterSpacing": 0,
- "lineHeight": 22,
+ "lineHeight": 24,
}
}
>
@@ -36,16 +36,57 @@ exports[`AssetOverview should render correctly 1`] = `
)
@@ -188,7 +229,7 @@ exports[`AssetOverview should render correctly 1`] = `
style={
{
"alignItems": "center",
- "backgroundColor": "#00000014",
+ "backgroundColor": "#0376c9",
"borderRadius": 40,
"justifyContent": "center",
"paddingHorizontal": 8,
@@ -201,7 +242,7 @@ exports[`AssetOverview should render correctly 1`] = `
accessibilityRole="text"
style={
{
- "color": "#141618",
+ "color": "#ffffff",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 12,
"fontWeight": "400",
@@ -232,7 +273,7 @@ exports[`AssetOverview should render correctly 1`] = `
accessibilityRole="text"
style={
{
- "color": "#6a737d",
+ "color": "#0376c9",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 12,
"fontWeight": "400",
@@ -263,7 +304,7 @@ exports[`AssetOverview should render correctly 1`] = `
accessibilityRole="text"
style={
{
- "color": "#6a737d",
+ "color": "#0376c9",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 12,
"fontWeight": "400",
@@ -294,7 +335,7 @@ exports[`AssetOverview should render correctly 1`] = `
accessibilityRole="text"
style={
{
- "color": "#6a737d",
+ "color": "#0376c9",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 12,
"fontWeight": "400",
@@ -325,7 +366,7 @@ exports[`AssetOverview should render correctly 1`] = `
accessibilityRole="text"
style={
{
- "color": "#6a737d",
+ "color": "#0376c9",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 12,
"fontWeight": "400",
@@ -356,7 +397,7 @@ exports[`AssetOverview should render correctly 1`] = `
accessibilityRole="text"
style={
{
- "color": "#6a737d",
+ "color": "#0376c9",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 12,
"fontWeight": "400",
@@ -864,18 +905,60 @@ exports[`AssetOverview should render correctly 1`] = `
}
>
Your balance
diff --git a/app/components/UI/AssetSearch/index.tsx b/app/components/UI/AssetSearch/index.tsx
index b1cfd4be105..dfc06c6462d 100644
--- a/app/components/UI/AssetSearch/index.tsx
+++ b/app/components/UI/AssetSearch/index.tsx
@@ -3,6 +3,7 @@ import {
TextInput,
View,
StyleSheet,
+ Platform,
TextStyle,
DimensionValue,
} from 'react-native';
@@ -13,7 +14,8 @@ import { toLowerCaseEquals } from '../../../util/general';
import { useSelector } from 'react-redux';
import { TokenListToken } from '@metamask/assets-controllers';
import { useTheme } from '../../../util/theme';
-import { ImportTokenViewSelectorsIDs } from '../../../../e2e/selectors/wallet/ImportTokenView.selectors';
+import generateTestId from '../../../../wdio/utils/generateTestId';
+import { TOKEN_INPUT_BOX_ID } from '../../../../wdio/screen-objects/testIDs/Screens/AssetSearch.testIds';
import { TokenViewSelectors } from '../../../../e2e/selectors/AddTokenView.selectors';
import { selectTokenListArray } from '../../../selectors/tokenListController';
import Icon, {
@@ -164,7 +166,7 @@ const AssetSearch = memo(({ onSearch, onFocus, onBlur }: Props) => {
placeholder={strings('token.search_tokens_placeholder')}
placeholderTextColor={colors.text.muted}
onChangeText={handleSearch}
- testID={ImportTokenViewSelectorsIDs.SEARCH_BAR}
+ {...generateTestId(Platform, TOKEN_INPUT_BOX_ID)}
keyboardAppearance={themeAppearance}
/>
diff --git a/app/components/UI/BasicFunctionality/BasicFunctionalityModal/BasicFunctionalityModal.tsx b/app/components/UI/BasicFunctionality/BasicFunctionalityModal/BasicFunctionalityModal.tsx
index e01d3afdccb..b2d26f68838 100644
--- a/app/components/UI/BasicFunctionality/BasicFunctionalityModal/BasicFunctionalityModal.tsx
+++ b/app/components/UI/BasicFunctionality/BasicFunctionalityModal/BasicFunctionalityModal.tsx
@@ -26,7 +26,10 @@ import Icon, {
IconSize,
} from '../../../../component-library/components/Icons/Icon';
import Routes from '../../../../constants/navigation/Routes';
-import NotificationsService from '../../../../util/notifications/services/NotificationService';
+import {
+ asyncAlert,
+ requestPushNotificationsPermission,
+} from '../../../../util/notifications';
import { MetaMetricsEvents } from '../../../../core/Analytics';
import { useEnableNotifications } from '../../../../util/notifications/hooks/useNotifications';
import { useMetrics } from '../../../hooks/useMetrics';
@@ -34,6 +37,7 @@ import {
selectIsProfileSyncingEnabled,
selectIsMetamaskNotificationsEnabled,
} from '../../../../selectors/notifications';
+import { AuthorizationStatus } from '@notifee/react-native';
interface Props {
route: {
@@ -61,11 +65,18 @@ const BasicFunctionalityModal = ({ route }: Props) => {
const { enableNotifications } = useEnableNotifications();
const enableNotificationsFromModal = useCallback(async () => {
- const { permission } = await NotificationsService.getAllPermissions(false);
- if (permission !== 'authorized') {
- return;
- }
+ const nativeNotificationStatus = await requestPushNotificationsPermission(
+ asyncAlert,
+ );
+
+ if (nativeNotificationStatus?.authorizationStatus === AuthorizationStatus.AUTHORIZED) {
+ /**
+ * Although this is an async function, we are dispatching an action (firing & forget)
+ * to emulate optimistic UI.
+ *
+ */
enableNotifications();
+ }
}, [enableNotifications]);
const closeBottomSheet = async () => {
diff --git a/app/components/UI/BlockingActionModal/index.tsx b/app/components/UI/BlockingActionModal/index.js
similarity index 80%
rename from app/components/UI/BlockingActionModal/index.tsx
rename to app/components/UI/BlockingActionModal/index.js
index c29a8f34e29..b126438edf0 100644
--- a/app/components/UI/BlockingActionModal/index.tsx
+++ b/app/components/UI/BlockingActionModal/index.js
@@ -1,11 +1,11 @@
import React from 'react';
+import PropTypes from 'prop-types';
import { ActivityIndicator, StyleSheet, View } from 'react-native';
import Modal from 'react-native-modal';
import { baseStyles } from '../../../styles/common';
import { useTheme } from '../../../util/theme';
-import { Theme } from '@metamask/design-tokens';
-const createStyles = (colors: Theme['colors']) =>
+const createStyles = (colors) =>
StyleSheet.create({
modal: {
margin: 0,
@@ -26,25 +26,6 @@ const createStyles = (colors: Theme['colors']) =>
},
});
-interface BlockingActionModalProps {
- /**
- * Whether modal is shown
- */
- modalVisible: boolean;
- /**
- * Whether a spinner is shown
- */
- isLoadingAction: boolean;
- /**
- * Content to display above the action buttons
- */
- children: React.ReactNode;
- /**
- * Callback function when modal animation is completed
- */
- onAnimationCompleted?: () => void;
-}
-
/**
* View that renders an action modal
*/
@@ -53,7 +34,7 @@ export default function BlockingActionModal({
modalVisible,
isLoadingAction,
onAnimationCompleted,
-}: BlockingActionModalProps) {
+}) {
const { colors } = useTheme();
const styles = createStyles(colors);
@@ -77,3 +58,20 @@ export default function BlockingActionModal({
);
}
+
+BlockingActionModal.propTypes = {
+ /**
+ * Whether modal is shown
+ */
+ modalVisible: PropTypes.bool,
+ /**
+ * Whether a spinner is shown
+ */
+ isLoadingAction: PropTypes.bool,
+ /**
+ * Content to display above the action buttons
+ */
+ children: PropTypes.node,
+
+ onAnimationCompleted: PropTypes.func,
+};
diff --git a/app/components/UI/BottomModal/BottomModal.test.tsx b/app/components/UI/BottomModal/BottomModal.test.tsx
deleted file mode 100644
index e5204501b33..00000000000
--- a/app/components/UI/BottomModal/BottomModal.test.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-import { Text, View } from 'react-native';
-
-import renderWithProvider from '../../../util/test/renderWithProvider';
-import BottomModal from '.';
-
-describe('BottomModal', () => {
- it('should match snapshot', async () => {
- const container = renderWithProvider(
-
-
- DUMMY
-
- ,
- { state: {} },
- );
- expect(container).toMatchSnapshot();
- });
-});
diff --git a/app/components/UI/BottomModal/BottomModal.tsx b/app/components/UI/BottomModal/BottomModal.tsx
deleted file mode 100644
index 7dbeb15ede4..00000000000
--- a/app/components/UI/BottomModal/BottomModal.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import React, { ReactChild } from 'react';
-import Modal from 'react-native-modal';
-import { StyleSheet } from 'react-native';
-
-import { useTheme } from '../../../util/theme';
-
-interface BottomModalProps {
- children: ReactChild;
- onClose?: () => void;
-}
-
-const styles = StyleSheet.create({
- bottomModal: {
- justifyContent: 'flex-end',
- margin: 0,
- },
-});
-
-const BottomModal = ({ children, onClose }: BottomModalProps) => {
- const { colors } = useTheme();
-
- return (
-
- {children}
-
- );
-};
-
-export default BottomModal;
diff --git a/app/components/UI/BottomModal/__snapshots__/BottomModal.test.tsx.snap b/app/components/UI/BottomModal/__snapshots__/BottomModal.test.tsx.snap
deleted file mode 100644
index 6325a757835..00000000000
--- a/app/components/UI/BottomModal/__snapshots__/BottomModal.test.tsx.snap
+++ /dev/null
@@ -1,124 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`BottomModal should match snapshot 1`] = `
-
-
-
-
-
- DUMMY
-
-
-
-
-`;
diff --git a/app/components/UI/BottomModal/index.tsx b/app/components/UI/BottomModal/index.tsx
deleted file mode 100644
index 3e78bd6309c..00000000000
--- a/app/components/UI/BottomModal/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './BottomModal';
diff --git a/app/components/UI/ComponentErrorBoundary/index.js b/app/components/UI/ComponentErrorBoundary/index.js
new file mode 100644
index 00000000000..d532728cdc3
--- /dev/null
+++ b/app/components/UI/ComponentErrorBoundary/index.js
@@ -0,0 +1,58 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Logger from '../../../util/Logger';
+import trackErrorAsAnalytics from '../../../util/metrics/TrackError/trackErrorAsAnalytics';
+
+class ComponentErrorBoundary extends React.Component {
+ state = { error: null };
+
+ static propTypes = {
+ /**
+ * Component to be used when there is no error
+ */
+ children: PropTypes.oneOfType([
+ PropTypes.arrayOf(PropTypes.node),
+ PropTypes.node,
+ ]),
+ /**
+ * Component label for logging
+ */
+ componentLabel: PropTypes.string.isRequired,
+ /**
+ * Function to be called when there is an error
+ */
+ onError: PropTypes.func,
+ /**
+ * Will not track as an error, but still log to analytics
+ */
+ dontTrackAsError: PropTypes.bool,
+ };
+
+ static getDerivedStateFromError(error) {
+ return { error };
+ }
+
+ componentDidCatch(error, errorInfo) {
+ // eslint-disable-next-line no-unused-expressions
+ this.props.onError?.();
+
+ const { componentLabel, dontTrackAsError } = this.props;
+
+ if (dontTrackAsError) {
+ return trackErrorAsAnalytics(
+ `Component Error Boundary: ${componentLabel}`,
+ error?.message,
+ );
+ }
+ Logger.error(error, { View: this.props.componentLabel, ...errorInfo });
+ }
+
+ getErrorMessage = () =>
+ `Component: ${this.props.componentLabel}\n${this.state.error.toString()}`;
+
+ render() {
+ return this.state.error ? null : this.props.children;
+ }
+}
+
+export default ComponentErrorBoundary;
diff --git a/app/components/UI/ComponentErrorBoundary/index.tsx b/app/components/UI/ComponentErrorBoundary/index.tsx
deleted file mode 100644
index 788c502297c..00000000000
--- a/app/components/UI/ComponentErrorBoundary/index.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import React from 'react';
-import Logger from '../../../util/Logger';
-import trackErrorAsAnalytics from '../../../util/metrics/TrackError/trackErrorAsAnalytics';
-
-interface ComponentErrorBoundaryProps {
- /**
- * Component to be used when there is no error
- */
- children: React.ReactNode;
- /**
- * Component label for logging
- */
- componentLabel: string;
- /**
- * Function to be called when there is an error
- */
- onError?: () => void;
- /**
- * Will not track as an error, but still log to analytics
- */
- dontTrackAsError?: boolean;
-}
-
-interface ComponentErrorBoundaryState {
- error: Error | null;
-}
-
-class ComponentErrorBoundary extends React.Component {
- state: ComponentErrorBoundaryState = { error: null };
-
- static getDerivedStateFromError(error: Error): ComponentErrorBoundaryState {
- return { error };
- }
-
- componentDidCatch(error: Error, errorInfo: React.ErrorInfo): void {
- this.props.onError?.();
-
- const { componentLabel, dontTrackAsError } = this.props;
-
- if (dontTrackAsError) {
- return trackErrorAsAnalytics(
- `Component Error Boundary: ${componentLabel}`,
- error?.message,
- );
- }
- Logger.error(error, { View: this.props.componentLabel, ...errorInfo });
- }
-
- getErrorMessage = (): string =>
- `Component: ${this.props.componentLabel}\n${this.state.error?.toString()}`;
-
- render(): React.ReactNode {
- return this.state.error ? null : this.props.children;
- }
-}
-
-export default ComponentErrorBoundary;
diff --git a/app/components/UI/ConfirmAddAsset/ConfirmAddAsset.tsx b/app/components/UI/ConfirmAddAsset/ConfirmAddAsset.tsx
index 097b76baf44..e6701455b55 100644
--- a/app/components/UI/ConfirmAddAsset/ConfirmAddAsset.tsx
+++ b/app/components/UI/ConfirmAddAsset/ConfirmAddAsset.tsx
@@ -1,5 +1,5 @@
import React, { useCallback, useEffect } from 'react';
-import { View } from 'react-native';
+import { View, Platform } from 'react-native';
import Text, {
TextVariant,
} from '../../../component-library/components/Texts/Text';
@@ -36,7 +36,11 @@ import Modal from 'react-native-modal';
import Box from '../Ramp/components/Box';
import SheetHeader from '../../../component-library/components/Sheet/SheetHeader';
import Routes from '../../../constants/navigation/Routes';
-import { ImportTokenViewSelectorsIDs } from '../../../../e2e/selectors/wallet/ImportTokenView.selectors';
+import generateTestId from '../../../../wdio/utils/generateTestId';
+import {
+ ADD_CANCEL_ADD_CUSTOM_ASSET_MODAL,
+ ADD_CONFIRM_CUSTOM_ASSET,
+} from '../../../../wdio/screen-objects/testIDs/Screens/AddCustomToken.testIds';
import { TOKEN_TITLE } from '../../../components/Views/AddAsset/AddAsset.constants';
const RenderBalance = (asset: {
@@ -125,7 +129,7 @@ const ConfirmAddAsset = () => {
>
@@ -171,7 +175,7 @@ const ConfirmAddAsset = () => {
return (
{strings('wallet.import_token')}
diff --git a/app/components/UI/ConnectHeader/index.js b/app/components/UI/ConnectHeader/index.js
new file mode 100644
index 00000000000..acd3af74261
--- /dev/null
+++ b/app/components/UI/ConnectHeader/index.js
@@ -0,0 +1,61 @@
+import React, { Component } from 'react';
+import { View, StyleSheet, TouchableOpacity } from 'react-native';
+import PropTypes from 'prop-types';
+import IonicIcon from 'react-native-vector-icons/Ionicons';
+import Text, {
+ TextVariant,
+} from '../../../component-library/components/Texts/Text';
+import { ThemeContext, mockTheme } from '../../../util/theme';
+
+const createStyles = (colors) =>
+ StyleSheet.create({
+ header: {
+ width: '100%',
+ position: 'relative',
+ paddingBottom: 20,
+ },
+ title: {
+ color: colors.text.default,
+ fontSize: 16,
+ textAlign: 'center',
+ paddingVertical: 12,
+ },
+ back: {
+ position: 'absolute',
+ zIndex: 1,
+ paddingVertical: 10,
+ paddingRight: 10,
+ },
+ });
+
+class ConnectHeader extends Component {
+ static propTypes = {
+ action: PropTypes.func.isRequired,
+ title: PropTypes.string.isRequired,
+ };
+
+ render() {
+ const { title, action } = this.props;
+ const colors = this.context.colors || mockTheme.colors;
+ const styles = createStyles(colors);
+
+ return (
+
+
+
+
+
+ {title}
+
+
+ );
+ }
+}
+
+ConnectHeader.contextType = ThemeContext;
+
+export default ConnectHeader;
diff --git a/app/components/UI/ConnectHeader/index.tsx b/app/components/UI/ConnectHeader/index.tsx
deleted file mode 100644
index ec7042ccc3d..00000000000
--- a/app/components/UI/ConnectHeader/index.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import React from 'react';
-import { View, StyleSheet, TouchableOpacity } from 'react-native';
-import IonicIcon from 'react-native-vector-icons/Ionicons';
-import Text, {
- TextVariant,
-} from '../../../component-library/components/Texts/Text';
-import { ThemeContext, mockTheme } from '../../../util/theme';
-import { Theme } from '@metamask/design-tokens';
-
-interface ConnectHeaderProps {
- action: () => void;
- title: string;
-}
-
-const createStyles = (colors: Theme['colors']) =>
- StyleSheet.create({
- header: {
- width: '100%',
- position: 'relative',
- paddingBottom: 20,
- },
- title: {
- color: colors.text.default,
- fontSize: 16,
- textAlign: 'center',
- paddingVertical: 12,
- },
- back: {
- position: 'absolute',
- zIndex: 1,
- paddingVertical: 10,
- paddingRight: 10,
- },
- });
-
-const ConnectHeader: React.FC = ({ title, action }) => {
- const context = React.useContext(ThemeContext);
- const colors = context?.colors || mockTheme.colors;
- const styles = createStyles(colors);
-
- return (
-
-
-
-
-
- {title}
-
-
- );
-};
-
-export default ConnectHeader;
diff --git a/app/components/UI/FadeView/index.tsx b/app/components/UI/FadeView/index.js
similarity index 62%
rename from app/components/UI/FadeView/index.tsx
rename to app/components/UI/FadeView/index.js
index 8fe7b419621..592d5ee2549 100644
--- a/app/components/UI/FadeView/index.tsx
+++ b/app/components/UI/FadeView/index.js
@@ -1,39 +1,30 @@
-import React, { PureComponent, ReactNode } from 'react';
-import { Animated, StyleProp, ViewStyle } from 'react-native';
-
-interface FadeViewPropTypes {
- /**
- * Determines to show / hide the children components
- */
- visible: boolean;
- /**
- * Children components of the FadeView
- * it can be a text node, an image, or an icon
- * or an Array with a combination of them
- */
- children?: ReactNode;
- /**
- * Styles to be applied to the FadeView
- */
- style?: StyleProp;
-}
-
-interface FadeViewState {
- visible: boolean;
-}
+import React, { PureComponent } from 'react';
+import PropTypes from 'prop-types';
+import { Animated, ViewPropTypes } from 'react-native';
/**
* View that has the ability to fade in / out
* his children by using the visible prop
*/
-export default class FadeView extends PureComponent<
- FadeViewPropTypes,
- FadeViewState
-> {
- visibility: Animated.Value;
- mounted: boolean = false;
+export default class FadeView extends PureComponent {
+ static propTypes = {
+ /**
+ * Determines to show / hide the children components
+ */
+ visible: PropTypes.bool,
+ /**
+ * Children components of the FadeView
+ * it can be a text node, an image, or an icon
+ * or an Array with a combination of them
+ */
+ children: PropTypes.any,
+ /**
+ * Styles to be applied to the FadeView
+ */
+ style: ViewPropTypes.style,
+ };
- constructor(props: FadeViewPropTypes) {
+ constructor(props) {
super(props);
this.state = {
visible: props.visible,
diff --git a/app/components/UI/GenericButton/index.android.tsx b/app/components/UI/GenericButton/index.android.js
similarity index 74%
rename from app/components/UI/GenericButton/index.android.tsx
rename to app/components/UI/GenericButton/index.android.js
index 31c0f904e48..d715f3567a7 100644
--- a/app/components/UI/GenericButton/index.android.tsx
+++ b/app/components/UI/GenericButton/index.android.js
@@ -1,5 +1,6 @@
import React from 'react';
-import { View, TouchableNativeFeedback, StyleProp, ViewStyle, GestureResponderEvent } from 'react-native';
+import PropTypes from 'prop-types';
+import { View, ViewPropTypes, TouchableNativeFeedback } from 'react-native';
/**
* @deprecated The `` component has been deprecated in favor of the new `
);
}
return (
-
+
-
- {renderHeader()}
-
-
- {!isAlreadyConnected || isNetworkSwitch
- ? strings('permissions.title_dapp_url_wants_to', {
- dappUrl: new URL(currentPageInformation.url).hostname,
- })
- : strings('permissions.title_dapp_url_has_approval_to', {
- dappUrl: new URL(currentPageInformation.url).hostname,
- })}
-
-
- {!isNetworkSwitch && renderAccountPermissionsRequestInfoCard()}
- {renderNetworkPermissionsRequestInfoCard()}
-
-
- {isAlreadyConnected && isDisconnectAllShown && (
-
-
-
- )}
- {showActionButtons && (
-
-
- {strings('permissions.cancel')}
-
-
- {strings('confirmation_modal.confirm_cta')}
-
-
- )}
+ {renderHeader()}
+
+
+ {isInitialDappConnection
+ ? strings('permissions.title_dapp_url_wants_to', {
+ dappUrl: new URL(currentPageInformation.url).hostname,
+ })
+ : strings('permissions.title_dapp_url_has_approval_to', {
+ dappUrl: new URL(currentPageInformation.url).hostname,
+ })}
+
+ {renderAccountPermissionsRequestInfoCard()}
+ {renderNetworkPermissionsRequestInfoCard()}
+ {showActionButtons && (
+
+
+ {strings('permissions.cancel')}
+
+
+ {strings('confirmation_modal.confirm_cta')}
+
+
+ )}
);
diff --git a/app/components/UI/PermissionsSummary/PermissionsSummary.types.ts b/app/components/UI/PermissionsSummary/PermissionsSummary.types.ts
index c80d27e198a..949ff145f5c 100644
--- a/app/components/UI/PermissionsSummary/PermissionsSummary.types.ts
+++ b/app/components/UI/PermissionsSummary/PermissionsSummary.types.ts
@@ -11,8 +11,6 @@ export interface PermissionsSummaryProps {
onBack?: () => void;
onUserAction?: React.Dispatch>;
showActionButtons?: boolean;
+ isInitialDappConnection?: boolean;
isAlreadyConnected?: boolean;
- isRenderedAsBottomSheet?: boolean;
- isDisconnectAllShown?: boolean;
- isNetworkSwitch?: boolean;
}
diff --git a/app/components/UI/PermissionsSummary/__snapshots__/PermissionsSummary.test.tsx.snap b/app/components/UI/PermissionsSummary/__snapshots__/PermissionsSummary.test.tsx.snap
index 07ce968d48c..07551011cc3 100644
--- a/app/components/UI/PermissionsSummary/__snapshots__/PermissionsSummary.test.tsx.snap
+++ b/app/components/UI/PermissionsSummary/__snapshots__/PermissionsSummary.test.tsx.snap
@@ -1,118 +1,481 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`PermissionsSummary should render correctly 1`] = `
-
+
-
+
+
+
+
+ a
+
+
+
+
+
+
+
+
+ app.uniswap.org wants to:
+
+
+
+
+
+
+
+
+ See your accounts and suggest transactions
+
-
+
+ Requesting for
+
+
+ Account 2
+
+
+
+
+
-
- a
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
@@ -121,68 +484,35 @@ exports[`PermissionsSummary should render correctly 1`] = `
style={
{
"color": "#141618",
- "fontFamily": "EuclidCircularB-Bold",
- "fontSize": 16,
- "fontWeight": "700",
+ "fontFamily": "EuclidCircularB-Regular",
+ "fontSize": 14,
+ "fontWeight": "400",
"letterSpacing": 0,
- "lineHeight": 24,
+ "lineHeight": 22,
}
}
>
- app.uniswap.org has approval to:
+ Use your enabled networks
-
-
-
-
-
- See your accounts and suggest transactions
+
+ Requesting for
+
+
+ Ethereum Main Network
+
+
+
-
-
+
+
+
+
+
- Requesting for
-
-
- Account 2
-
-
+ testID="token-avatar-image"
+ />
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Use your enabled networks
-
-
-
-
-
- Requesting for
-
-
- Ethereum Main Network
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- +1
-
-
-
+ +1
+
-
-
-
-
-
-
-
+
+
-
- Disconnect all
-
-
+
+
-
-
+
+
- Cancel
-
-
-
+
-
- Confirm
-
-
-
+ Confirm
+
+
diff --git a/app/components/UI/Ramp/Views/Settings/__snapshots__/Settings.test.tsx.snap b/app/components/UI/Ramp/Views/Settings/__snapshots__/Settings.test.tsx.snap
index a80c9ed4655..daa7e9670b4 100644
--- a/app/components/UI/Ramp/Views/Settings/__snapshots__/Settings.test.tsx.snap
+++ b/app/components/UI/Ramp/Views/Settings/__snapshots__/Settings.test.tsx.snap
@@ -656,6 +656,8 @@ exports[`Settings Activation Keys renders correctly when is loading 1`] = `
accessible={true}
style={
{
+ "alignItems": "center",
+ "flexDirection": "row",
"padding": 16,
}
}
@@ -663,211 +665,202 @@ exports[`Settings Activation Keys renders correctly when is loading 1`] = `
-
-
-
-
+
+
+
+
-
+ test key 1
+
+
-
- test key 1
-
-
- testKey1
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+ width={24}
+ />
+
-
-
-
-
+
+
+
+
-
+ test key 2
+
+
-
- test key 2
-
-
- testKey2
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+ width={24}
+ />
+
-
-
-
-
+
+
+
+
-
+ test key 1
+
+
-
- test key 1
-
-
- testKey1
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+ width={24}
+ />
+
-
-
-
-
+
+
+
+
-
+ test key 2
+
+
-
- test key 2
-
-
- testKey2
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+ width={24}
+ />
+
{
label={strings('transaction.next')}
onPress={goToConfirmAddToken}
isDisabled={selectedAsset.length < 1}
- testID={ImportTokenViewSelectorsIDs.NEXT_BUTTON}
+ testID="token-import-next-button"
/>
diff --git a/app/components/UI/Stake/Views/InputView/StakeInputView.test.tsx b/app/components/UI/Stake/Views/InputView/StakeInputView.test.tsx
index dca7cbb8ca8..81e2a74aa00 100644
--- a/app/components/UI/Stake/Views/InputView/StakeInputView.test.tsx
+++ b/app/components/UI/Stake/Views/InputView/StakeInputView.test.tsx
@@ -10,7 +10,7 @@ function render(Component: React.ComponentType) {
return renderScreen(
Component,
{
- name: Routes.STAKING.STAKE,
+ name: Routes.STAKE.STAKE,
},
{
state: {
@@ -127,13 +127,5 @@ describe('StakeInputView', () => {
fireEvent.press(screen.getByText('4'));
expect(screen.queryAllByText('Not enough ETH')).toHaveLength(2);
});
-
- it('navigates to Learn more modal when learn icon is pressed', () => {
- render(StakeInputView);
- fireEvent.press(screen.getByLabelText('Learn More'));
- expect(mockNavigate).toHaveBeenCalledWith('StakeModals', {
- screen: Routes.STAKING.MODALS.LEARN_MORE,
- });
- });
});
});
diff --git a/app/components/UI/Stake/Views/InputView/StakeInputView.tsx b/app/components/UI/Stake/Views/InputView/StakeInputView.tsx
index d9c1f63afd0..89f12bb48f4 100644
--- a/app/components/UI/Stake/Views/InputView/StakeInputView.tsx
+++ b/app/components/UI/Stake/Views/InputView/StakeInputView.tsx
@@ -35,7 +35,6 @@ import QuickAmounts from '../../components/QuickAmounts';
import useBalance from '../../hooks/useBalance';
import styleSheet from './StakeInputView.styles';
import EstimatedAnnualRewardsCard from '../../components/EstimatedAnnualRewardsCard';
-import Routes from '../../../../../constants/navigation/Routes';
const StakeInputView = () => {
const navigation = useNavigation();
@@ -57,12 +56,6 @@ const StakeInputView = () => {
const currentCurrency = useSelector(selectCurrentCurrency);
const conversionRate = useSelector(selectConversionRate) || 1;
- const navigateToLearnMoreModal = () => {
- navigation.navigate('StakeModals', {
- screen: Routes.STAKING.MODALS.LEARN_MORE,
- });
- };
-
const balanceText = isEth
? `${balance} ETH`
: `${balanceFiatNumber?.toString()} ${currentCurrency.toUpperCase()}`;
@@ -226,7 +219,9 @@ const StakeInputView = () => {
{
+ // TODO: Add tooltip modal
+ }}
/>
{strings('stake.metamask_pool')}
-
+
diff --git a/app/components/UI/Stake/components/LearnMoreModal/LearnMoreModal.styles.ts b/app/components/UI/Stake/components/LearnMoreModal/LearnMoreModal.styles.ts
deleted file mode 100644
index bb2ca5c6278..00000000000
--- a/app/components/UI/Stake/components/LearnMoreModal/LearnMoreModal.styles.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { StyleSheet } from 'react-native';
-
-const createLearnMoreModalStyles = () =>
- StyleSheet.create({
- container: {
- paddingHorizontal: 24,
- paddingTop: 24,
- },
- imageContainer: {
- alignItems: 'center',
- paddingBottom: 16,
- },
- bannerImage: {
- width: '100%',
- height: 200,
- borderRadius: 12,
- },
- textContainer: {
- paddingVertical: 8,
- },
- buttonContainer: {
- flexDirection: 'row',
- gap: 16,
- paddingHorizontal: 16,
- paddingTop: 16,
- },
- button: {
- flex: 1,
- },
- italicText: {
- fontStyle: 'italic',
- },
- });
-
-export default createLearnMoreModalStyles;
diff --git a/app/components/UI/Stake/components/LearnMoreModal/LearnMoreModal.test.tsx b/app/components/UI/Stake/components/LearnMoreModal/LearnMoreModal.test.tsx
deleted file mode 100644
index e290bea31e5..00000000000
--- a/app/components/UI/Stake/components/LearnMoreModal/LearnMoreModal.test.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { fireEvent, screen } from '@testing-library/react-native';
-import LearnMoreModal from '.';
-import { POOLED_STAKING_FAQ_URL } from '../../constants';
-import Routes from '../../../../../constants/navigation/Routes';
-import { renderScreen } from '../../../../../util/test/renderWithProvider';
-import { strings } from '../../../../../../locales/i18n';
-
-const renderLearnMoreModal = () =>
- renderScreen(LearnMoreModal, { name: Routes.STAKING.MODALS.LEARN_MORE });
-
-const mockNavigate = jest.fn();
-
-jest.mock('@react-navigation/native', () => {
- const actualReactNavigation = jest.requireActual('@react-navigation/native');
- return {
- ...actualReactNavigation,
- useNavigation: () => ({
- navigate: mockNavigate,
- }),
- };
-});
-
-describe('LearnMoreModal', () => {
- beforeEach(() => {
- jest.clearAllMocks();
- });
-
- it('render matches snapshot', () => {
- const { toJSON } = renderLearnMoreModal();
- expect(toJSON()).toMatchSnapshot();
- });
-
- it('navigates to FAQ page when "Learn More" button is pressed', () => {
- renderLearnMoreModal();
- // Simulate pressing the "Learn More" button
- fireEvent.press(screen.getByText(strings('stake.learn_more')));
-
- // Assert that navigate is called with the correct parameters
- expect(mockNavigate).toHaveBeenCalledWith('Webview', {
- screen: 'SimpleWebview',
- params: { url: POOLED_STAKING_FAQ_URL },
- });
- });
-});
diff --git a/app/components/UI/Stake/components/LearnMoreModal/__snapshots__/LearnMoreModal.test.tsx.snap b/app/components/UI/Stake/components/LearnMoreModal/__snapshots__/LearnMoreModal.test.tsx.snap
deleted file mode 100644
index a5b380a956d..00000000000
--- a/app/components/UI/Stake/components/LearnMoreModal/__snapshots__/LearnMoreModal.test.tsx.snap
+++ /dev/null
@@ -1,726 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`LearnMoreModal render matches snapshot 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
- LearnMore
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Stake ETH and earn
-
-
-
-
- Stake any amount of ETH
-
-
- No minimum required.
-
-
-
-
- Earn ETH rewards
-
-
- Start earning as soon as you stake. Rewards compound automatically.
-
-
-
-
- Flexible unstaking
-
-
- Unstake anytime. Typically takes up to 11 days to process.
-
-
-
-
- Staking does not guarantee rewards, and involves risks including a loss of funds.
-
-
-
-
-
-
-
- Learn more
-
-
-
-
-
-
- Got it
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
diff --git a/app/components/UI/Stake/components/LearnMoreModal/index.tsx b/app/components/UI/Stake/components/LearnMoreModal/index.tsx
deleted file mode 100644
index 87e41a1a714..00000000000
--- a/app/components/UI/Stake/components/LearnMoreModal/index.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-import React, { useRef } from 'react';
-import { View, Image } from 'react-native';
-import BottomSheet, {
- type BottomSheetRef,
-} from '../../../../../component-library/components/BottomSheets/BottomSheet';
-import Text, {
- TextColor,
- TextVariant,
-} from '../../../../../component-library/components/Texts/Text';
-import LearnMoreImage from '../images/LearnMoreEthBanner.png';
-import Button, {
- ButtonSize,
- ButtonVariants,
- ButtonWidthTypes,
-} from '../../../../../component-library/components/Buttons/Button';
-import { useNavigation } from '@react-navigation/native';
-import { strings } from '../../../../../../locales/i18n';
-import { POOLED_STAKING_FAQ_URL } from '../../constants';
-import createLearnMoreModalStyles from './LearnMoreModal.styles';
-
-const styles = createLearnMoreModalStyles();
-
-const ModalTextBlock = ({
- heading,
- body,
- bodyColor = TextColor.Alternative,
-}: {
- heading: string;
- body: string;
- bodyColor?: TextColor;
-}) => (
-
- {heading}
-
- {body}
-
-
-);
-
-const LearnMoreModal = () => {
- const sheetRef = useRef(null);
-
- const navigation = useNavigation();
-
- const handleClose = () => {
- sheetRef.current?.onCloseBottomSheet();
- };
-
- return (
-
-
-
-
-
-
-
-
- {strings('stake.stake_eth_and_earn')}
-
-
-
-
-
-
-
-
- {strings('stake.disclaimer')}
-
-
-
-
-
-
-
-
-
-
-
- );
-};
-
-export default LearnMoreModal;
diff --git a/app/components/UI/Stake/components/StakingBalance/StakingBalance.styles.ts b/app/components/UI/Stake/components/StakingBalance/StakingBalance.styles.ts
deleted file mode 100644
index 7f653872905..00000000000
--- a/app/components/UI/Stake/components/StakingBalance/StakingBalance.styles.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { StyleSheet } from 'react-native';
-
-const styleSheet = () =>
- StyleSheet.create({
- container: {
- paddingHorizontal: 16,
- },
- badgeWrapper: {
- alignSelf: 'center',
- },
- balances: {
- flex: 1,
- justifyContent: 'center',
- marginLeft: 20,
- alignSelf: 'center',
- },
- ethLogo: {
- width: 32,
- height: 32,
- borderRadius: 16,
- overflow: 'hidden',
- },
- bannerStyles: {
- marginVertical: 8,
- },
- buttonsContainer: {
- paddingTop: 8,
- },
- stakingCta: {
- paddingBottom: 8,
- },
- });
-
-export default styleSheet;
diff --git a/app/components/UI/Stake/components/StakingBalance/StakingBalance.test.tsx b/app/components/UI/Stake/components/StakingBalance/StakingBalance.test.tsx
deleted file mode 100644
index cb8074032cb..00000000000
--- a/app/components/UI/Stake/components/StakingBalance/StakingBalance.test.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import React from 'react';
-import { fireEvent, screen } from '@testing-library/react-native';
-import { renderScreen } from '../../../../../util/test/renderWithProvider';
-import { backgroundState } from '../../../../../util/test/initial-root-state';
-import StakingBalance from './StakingBalance';
-import { strings } from '../../../../../../locales/i18n';
-import Routes from '../../../../../constants/navigation/Routes';
-
-function render(Component: React.ComponentType) {
- return renderScreen(
- Component,
- {
- name: 'Asset',
- },
- {
- state: {
- engine: {
- backgroundState,
- },
- },
- },
- );
-}
-
-const mockNavigate = jest.fn();
-
-jest.mock('@react-navigation/native', () => {
- const actualReactNavigation = jest.requireActual('@react-navigation/native');
- return {
- ...actualReactNavigation,
- useNavigation: () => ({
- navigate: mockNavigate,
- }),
- };
-});
-describe('StakingBalance', () => {
- it('render matches snapshot', () => {
- render(StakingBalance);
- expect(screen.toJSON()).toMatchSnapshot();
- });
-
- it('redirects to StakeInputView on stake button click', () => {
- render(StakingBalance);
-
- fireEvent.press(screen.getByText(strings('stake.stake_more')));
-
- expect(mockNavigate).toHaveBeenCalledTimes(1);
- expect(mockNavigate).toHaveBeenCalledWith(Routes.STAKING.STAKE);
- });
-});
diff --git a/app/components/UI/Stake/components/StakingBalance/StakingBalance.tsx b/app/components/UI/Stake/components/StakingBalance/StakingBalance.tsx
deleted file mode 100644
index 8884688694b..00000000000
--- a/app/components/UI/Stake/components/StakingBalance/StakingBalance.tsx
+++ /dev/null
@@ -1,159 +0,0 @@
-import React, { useMemo, useState } from 'react';
-import Badge, {
- BadgeVariant,
-} from '../../../../../component-library/components/Badges/Badge';
-import BadgeWrapper from '../../../../../component-library/components/Badges/BadgeWrapper';
-import Text, {
- TextVariant,
-} from '../../../../../component-library/components/Texts/Text';
-import { useStyles } from '../../../../../component-library/hooks';
-import AssetElement from '../../../AssetElement';
-import NetworkMainAssetLogo from '../../../NetworkMainAssetLogo';
-import { selectNetworkName } from '../../../../../selectors/networkInfos';
-import { useSelector } from 'react-redux';
-import images from '../../../../../images/image-icons';
-import styleSheet from './StakingBalance.styles';
-import { View } from 'react-native';
-import StakingButtons from './StakingButtons/StakingButtons';
-import ClaimBanner from './StakingBanners/ClaimBanner/ClaimBanner';
-import UnstakingBanner from './StakingBanners/UnstakeBanner/UnstakeBanner';
-import Banner, {
- BannerAlertSeverity,
- BannerVariant,
-} from '../../../../../component-library/components/Banners/Banner';
-import { strings } from '../../../../../../locales/i18n';
-import { renderFromWei } from '../../../../../util/number';
-import { getTimeDifferenceFromNow } from '../../../../../util/date';
-import { filterExitRequests } from './utils';
-import { BN } from 'ethereumjs-util';
-import bn from 'bignumber.js';
-import {
- CommonPercentageInputUnits,
- fixDisplayAmount,
- formatPercent,
- PercentageOutputFormat,
-} from '../../utils/value';
-import { multiplyValueByPowerOfTen } from '../../utils/bignumber';
-import StakingCta from './StakingCta/StakingCta';
-import {
- MOCK_GET_POOLED_STAKES_API_RESPONSE,
- MOCK_GET_VAULT_RESPONSE,
- MOCK_STAKED_ETH_ASSET,
-} from './mockData';
-
-const StakingBalance = () => {
- const { styles } = useStyles(styleSheet, {});
-
- const networkName = useSelector(selectNetworkName);
-
- const [isGeoBlocked] = useState(false);
- const [hasStakedPositions] = useState(false);
-
- const { unstakingRequests, claimableRequests } = useMemo(
- () =>
- filterExitRequests(
- MOCK_GET_POOLED_STAKES_API_RESPONSE.accounts[0].exitRequests,
- MOCK_GET_POOLED_STAKES_API_RESPONSE.exchangeRate,
- ),
- [],
- );
-
- const claimableEth = useMemo(
- () =>
- renderFromWei(
- claimableRequests.reduce(
- (acc, { claimedAssets }) =>
- claimedAssets ? acc.add(new BN(claimedAssets)) : acc,
- new BN(0),
- ),
- ),
- [claimableRequests],
- );
-
- const hasClaimableEth = !!Number(claimableEth);
-
- return (
-
- {Boolean(MOCK_STAKED_ETH_ASSET.balance) && !isGeoBlocked && (
-
-
- }
- >
-
-
-
- {MOCK_STAKED_ETH_ASSET.name || MOCK_STAKED_ETH_ASSET.symbol}
-
-
- )}
-
-
- {isGeoBlocked ? (
-
- ) : (
- <>
- {unstakingRequests.map(
- ({ positionTicket, withdrawalTimestamp, assetsToDisplay }) =>
- assetsToDisplay && (
-
- ),
- )}
-
- {hasClaimableEth && (
-
- )}
-
- {!hasStakedPositions && (
-
- )}
-
-
-
- )}
-
-
- );
-};
-
-export default StakingBalance;
diff --git a/app/components/UI/Stake/components/StakingBalance/StakingBalance.types.ts b/app/components/UI/Stake/components/StakingBalance/StakingBalance.types.ts
deleted file mode 100644
index dec8e420060..00000000000
--- a/app/components/UI/Stake/components/StakingBalance/StakingBalance.types.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-export interface ExitRequest {
- positionTicket: string; // BigInt!
- timestamp: string; // BigInt!
- totalShares: string; // BigInt!
- receiver: string; // Bytes!
- /**
- * If `withdrawalTimestamp` is null, it means the request hasn't been processed yet.
- * If `withdrawalTimestamp` is "0", funds are withdrawable.
- * Else, `withdrawalTimestamp` shows an approximate UTC timestamp of when funds will be withdrawable.
- * `withdrawalTimestamp` is updated every 6 hours.
- */
- withdrawalTimestamp: string | null; // BigInt
-}
-
-export type ExitRequestWithClaimedAssetInfo = Pick<
- ExitRequest,
- 'positionTicket' | 'timestamp' | 'totalShares' | 'withdrawalTimestamp'
-> & {
- exitQueueIndex: string;
- claimedAssets: string | null;
- leftShares: string | null;
-};
-
-interface StakeByAccount {
- account: string;
- lifetimeRewards: string;
- assets: string;
- exitRequests: ExitRequestWithClaimedAssetInfo[];
-}
-
-export interface GetStakesApiResponse {
- accounts: StakeByAccount[];
- exchangeRate: string;
-}
-
-export interface Vault {
- apy: string; //BigDecimal!
- capacity: string; //BigInt!
- displayName: string | null; //String
- feePercent: number; // Int!
- totalAssets: string; //BigInt!
- addressString: string; //String!
-}
-
-export interface GetVaultDataApiResponse
- extends Pick {
- vaultAddress: string;
-}
-
-export interface UnstakingRequest extends ExitRequestWithClaimedAssetInfo {
- assetsToDisplay: string;
-}
diff --git a/app/components/UI/Stake/components/StakingBalance/StakingBanners/ClaimBanner/ClaimBanner.styles.ts b/app/components/UI/Stake/components/StakingBalance/StakingBanners/ClaimBanner/ClaimBanner.styles.ts
deleted file mode 100644
index d8450cebf83..00000000000
--- a/app/components/UI/Stake/components/StakingBalance/StakingBanners/ClaimBanner/ClaimBanner.styles.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { StyleSheet } from 'react-native';
-
-const styleSheet = () =>
- StyleSheet.create({
- claimButton: {
- alignSelf: 'flex-start',
- },
- });
-
-export default styleSheet;
diff --git a/app/components/UI/Stake/components/StakingBalance/StakingBanners/ClaimBanner/ClaimBanner.tsx b/app/components/UI/Stake/components/StakingBalance/StakingBanners/ClaimBanner/ClaimBanner.tsx
deleted file mode 100644
index 906be56cbc0..00000000000
--- a/app/components/UI/Stake/components/StakingBalance/StakingBanners/ClaimBanner/ClaimBanner.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import React from 'react';
-import Banner, {
- BannerAlertSeverity,
- BannerVariant,
-} from '../../../../../../../component-library/components/Banners/Banner';
-import Text, {
- TextVariant,
- TextColor,
-} from '../../../../../../../component-library/components/Texts/Text';
-import { strings } from '../../../../../../../../locales/i18n';
-import Button, {
- ButtonVariants,
-} from '../../../../../../../component-library/components/Buttons/Button';
-import useTooltipModal from '../../../../../../hooks/useTooltipModal';
-import { BannerProps } from '../../../../../../../component-library/components/Banners/Banner/Banner.types';
-import { useStyles } from '../../../../../../../component-library/hooks';
-import styleSheet from './ClaimBanner.styles';
-
-type StakeBannerProps = Pick & {
- claimableAmount: string;
-};
-
-const ClaimBanner = ({ claimableAmount, style }: StakeBannerProps) => {
- const { styles } = useStyles(styleSheet, {});
-
- const { openTooltipModal } = useTooltipModal();
-
- const onClaimPress = () => openTooltipModal('TODO', 'Connect to claim flow');
-
- return (
-
-
- {strings('stake.banner_text.has_claimable_eth', {
- amountEth: claimableAmount,
- })}
-
-
@@ -294,9 +292,9 @@ exports[`WalletAccount renders correctly 1`] = `
style={
{
"color": "#0376c9",
- "fontFamily": "EuclidCircularB-Medium",
+ "fontFamily": "EuclidCircularB-Regular",
"fontSize": 12,
- "fontWeight": "500",
+ "fontWeight": "400",
"letterSpacing": 0,
"lineHeight": 20,
}
diff --git a/app/components/Views/AccountConnect/AccountConnect.tsx b/app/components/Views/AccountConnect/AccountConnect.tsx
index a2a348c4dd9..065a9787740 100644
--- a/app/components/Views/AccountConnect/AccountConnect.tsx
+++ b/app/components/Views/AccountConnect/AccountConnect.tsx
@@ -71,8 +71,7 @@ import AccountConnectSingle from './AccountConnectSingle';
import AccountConnectSingleSelector from './AccountConnectSingleSelector';
import { PermissionsSummaryProps } from '../../../components/UI/PermissionsSummary/PermissionsSummary.types';
import PermissionsSummary from '../../../components/UI/PermissionsSummary';
-import { isMultichainVersion1Enabled } from '../../../util/networks';
-import NetworkConnectMultiSelector from '../NetworkConnect/NetworkConnectMultiSelector';
+import { isMutichainVersion1Enabled } from '../../../util/networks';
const createStyles = () =>
StyleSheet.create({
@@ -174,7 +173,7 @@ const AccountConnect = (props: AccountConnectProps) => {
channelIdOrHostname,
]);
- const urlWithProtocol = (hostname && !isUUID(hostname))
+ const urlWithProtocol = hostname
? prefixUrlWithProtocol(hostname)
: domainTitle;
@@ -557,8 +556,6 @@ const AccountConnect = (props: AccountConnectProps) => {
onEdit: () => {
setScreen(AccountConnectScreens.MultiConnectSelector);
},
- onEditNetworks: () =>
- setScreen(AccountConnectScreens.MultiConnectNetworkSelector),
onUserAction: setUserIntent,
isAlreadyConnected: false,
};
@@ -618,20 +615,6 @@ const AccountConnect = (props: AccountConnectProps) => {
],
);
- const renderMultiConnectNetworkSelectorScreen = useCallback(
- () => (
- setScreen(AccountConnectScreens.SingleConnect)}
- />
- ),
- [isLoading, urlWithProtocol, hostname],
- );
-
const renderPhishingModal = useCallback(
() => (
{
const renderConnectScreens = useCallback(() => {
switch (screen) {
case AccountConnectScreens.SingleConnect:
- return isMultichainVersion1Enabled
+ return isMutichainVersion1Enabled
? renderPermissionsSummaryScreen()
: renderSingleConnectScreen();
case AccountConnectScreens.SingleConnectSelector:
return renderSingleConnectSelectorScreen();
case AccountConnectScreens.MultiConnectSelector:
return renderMultiConnectSelectorScreen();
- case AccountConnectScreens.MultiConnectNetworkSelector:
- return renderMultiConnectNetworkSelectorScreen();
}
}, [
screen,
@@ -687,7 +668,6 @@ const AccountConnect = (props: AccountConnectProps) => {
renderPermissionsSummaryScreen,
renderSingleConnectSelectorScreen,
renderMultiConnectSelectorScreen,
- renderMultiConnectNetworkSelectorScreen,
]);
return (
diff --git a/app/components/Views/AccountConnect/AccountConnect.types.ts b/app/components/Views/AccountConnect/AccountConnect.types.ts
index dd94ca045b5..73c01a194f5 100644
--- a/app/components/Views/AccountConnect/AccountConnect.types.ts
+++ b/app/components/Views/AccountConnect/AccountConnect.types.ts
@@ -7,7 +7,6 @@ export enum AccountConnectScreens {
SingleConnect = 'SingleConnect',
SingleConnectSelector = 'SingleConnectSelector',
MultiConnectSelector = 'MultiConnectSelector',
- MultiConnectNetworkSelector = 'MultiConnectNetworkSelector',
}
export interface AccountConnectParams {
diff --git a/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.styles.ts b/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.styles.ts
index c255f107de9..2438c7b6944 100644
--- a/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.styles.ts
+++ b/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.styles.ts
@@ -3,19 +3,15 @@ import { StyleSheet } from 'react-native';
// External dependencies.
import { Theme } from '../../../../util/theme/models';
-import { isMultichainVersion1Enabled } from '../../../../util/networks';
+import { isMutichainVersion1Enabled } from '../../../../util/networks';
/**
* Style sheet function for AccountConnectMultiSelector screen.
* @returns StyleSheet object.
*/
-
-const styleSheet = (params: {
- theme: Theme;
- vars: { isRenderedAsBottomSheet: boolean | undefined };
-}) => {
+const styleSheet = (params: { theme: Theme }) => {
const { colors } = params.theme;
- const { vars } = params;
+
return StyleSheet.create({
container: {
height: '100%',
@@ -25,12 +21,12 @@ const styleSheet = (params: {
},
description: {
textAlign: 'center',
- marginVertical: isMultichainVersion1Enabled ? 8 : 16,
+ marginVertical: isMutichainVersion1Enabled ? 8 : 16,
color: colors.text.alternative,
},
ctaButtonsContainer: {
- marginTop: isMultichainVersion1Enabled ? 0 : 24,
- marginBottom: vars.isRenderedAsBottomSheet ? 0 : 16,
+ marginTop: isMutichainVersion1Enabled ? 0 : 24,
+ marginBottom: 16,
},
connectOrUpdateButtonContainer: { flexDirection: 'row' },
button: { flex: 1 },
diff --git a/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.tsx b/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.tsx
index 91d505d7cec..d2474c6d27f 100644
--- a/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.tsx
+++ b/app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.tsx
@@ -34,7 +34,7 @@ import {
} from './AccountConnectMultiSelector.types';
import { useNavigation } from '@react-navigation/native';
import Routes from '../../../../constants/navigation/Routes';
-import { isMultichainVersion1Enabled } from '../../../../util/networks';
+import { isMutichainVersion1Enabled } from '../../../../util/networks';
import Checkbox from '../../../../component-library/components/Checkbox';
const AccountConnectMultiSelector = ({
@@ -52,9 +52,8 @@ const AccountConnectMultiSelector = ({
connection,
onBack,
screenTitle,
- isRenderedAsBottomSheet = true,
}: AccountConnectMultiSelectorProps) => {
- const { styles } = useStyles(styleSheet, { isRenderedAsBottomSheet });
+ const { styles } = useStyles(styleSheet, {});
const { navigate } = useNavigation();
const [screen, setScreen] = useState(
AccountConnectMultiSelectorScreens.AccountMultiSelector,
@@ -93,7 +92,7 @@ const AccountConnectMultiSelector = ({
const renderSelectAllButton = useCallback(
() =>
Boolean(accounts.length) &&
- !isMultichainVersion1Enabled && (
+ !isMutichainVersion1Enabled && (
-
-
-
+
+
+ >
+
+
+
+
-
-
+
+
{
- const { vars } = params;
- return StyleSheet.create({
+const styleSheet = () =>
+ StyleSheet.create({
bottomSheetContainer: {
height: '100%',
},
@@ -13,8 +10,8 @@ const styleSheet = (params: {
paddingHorizontal: 16,
},
buttonsContainer: {
- marginTop: isMultichainVersion1Enabled ? 0 : 24,
- marginBottom: vars.isRenderedAsBottomSheet ? 0 : 16,
+ marginTop: isMutichainVersion1Enabled ? 0 : 24,
+ marginBottom: 16,
},
updateButtonContainer: { flexDirection: 'row' },
buttonPositioning: { flex: 1 },
@@ -36,6 +33,5 @@ const styleSheet = (params: {
flexDirection: 'row',
},
});
-};
export default styleSheet;
diff --git a/app/components/Views/NetworkConnect/NetworkConnectMultiSelector/NetworkConnectMultiSelector.tsx b/app/components/Views/NetworkConnect/NetworkConnectMultiSelector/NetworkConnectMultiSelector.tsx
index 181b86d44d7..5ba09617094 100644
--- a/app/components/Views/NetworkConnect/NetworkConnectMultiSelector/NetworkConnectMultiSelector.tsx
+++ b/app/components/Views/NetworkConnect/NetworkConnectMultiSelector/NetworkConnectMultiSelector.tsx
@@ -34,9 +34,8 @@ const NetworkConnectMultiSelector = ({
urlWithProtocol,
hostname,
onBack,
- isRenderedAsBottomSheet = true,
}: NetworkConnectMultiSelectorProps) => {
- const { styles } = useStyles(styleSheet, { isRenderedAsBottomSheet });
+ const { styles } = useStyles(styleSheet, {});
const { navigate } = useNavigation();
const [selectedNetworkIds, setSelectedNetworkIds] = useState([]);
diff --git a/app/components/Views/NetworkConnect/NetworkConnectMultiSelector/NetworkConnectMultiSelector.types.ts b/app/components/Views/NetworkConnect/NetworkConnectMultiSelector/NetworkConnectMultiSelector.types.ts
index 1b3406946ac..6780f896f1b 100644
--- a/app/components/Views/NetworkConnect/NetworkConnectMultiSelector/NetworkConnectMultiSelector.types.ts
+++ b/app/components/Views/NetworkConnect/NetworkConnectMultiSelector/NetworkConnectMultiSelector.types.ts
@@ -12,5 +12,4 @@ export interface NetworkConnectMultiSelectorProps {
urlWithProtocol: string;
hostname: string;
onBack: () => void;
- isRenderedAsBottomSheet?: boolean;
}
diff --git a/app/components/Views/NetworkSelector/__snapshots__/NetworkSelector.test.tsx.snap b/app/components/Views/NetworkSelector/__snapshots__/NetworkSelector.test.tsx.snap
index e7858e18e3e..d8ceabfffba 100644
--- a/app/components/Views/NetworkSelector/__snapshots__/NetworkSelector.test.tsx.snap
+++ b/app/components/Views/NetworkSelector/__snapshots__/NetworkSelector.test.tsx.snap
@@ -475,6 +475,7 @@ exports[`Network Selector renders correctly 1`] = `
"backgroundColor": "#ffffff",
"borderRadius": 4,
"opacity": 1,
+ "padding": 16,
"position": "relative",
}
}
@@ -485,7 +486,9 @@ exports[`Network Selector renders correctly 1`] = `
accessible={true}
style={
{
- "padding": 16,
+ "alignItems": "center",
+ "flexDirection": "row",
+ "padding": 0,
}
}
>
@@ -501,68 +504,59 @@ exports[`Network Selector renders correctly 1`] = `
style={
{
"alignItems": "center",
- "flexDirection": "row",
+ "backgroundColor": "#ffffff",
+ "borderRadius": 16,
+ "height": 32,
+ "justifyContent": "center",
+ "marginRight": 16,
+ "overflow": "hidden",
+ "width": 32,
}
}
+ testID="cellbase-avatar"
>
-
-
-
-
+
+
+
-
- Ethereum Main Network
-
-
+ Ethereum Main Network
+
@@ -602,6 +596,7 @@ exports[`Network Selector renders correctly 1`] = `
"backgroundColor": "#ffffff",
"borderRadius": 4,
"opacity": 1,
+ "padding": 16,
"position": "relative",
}
}
@@ -612,14 +607,15 @@ exports[`Network Selector renders correctly 1`] = `
accessible={true}
style={
{
- "padding": 16,
+ "alignItems": "center",
+ "flexDirection": "row",
+ "padding": 0,
}
}
>
-
-
-
-
+
+
+
-
- Linea Main Network
-
-
+ Linea Main Network
+
@@ -702,6 +690,7 @@ exports[`Network Selector renders correctly 1`] = `
"backgroundColor": "#ffffff",
"borderRadius": 4,
"opacity": 1,
+ "padding": 16,
"position": "relative",
}
}
@@ -712,7 +701,9 @@ exports[`Network Selector renders correctly 1`] = `
accessible={true}
style={
{
- "padding": 16,
+ "alignItems": "center",
+ "flexDirection": "row",
+ "padding": 0,
}
}
>
@@ -728,70 +719,61 @@ exports[`Network Selector renders correctly 1`] = `
style={
{
"alignItems": "center",
- "flexDirection": "row",
+ "backgroundColor": "#ffffff",
+ "borderRadius": 16,
+ "height": 32,
+ "justifyContent": "center",
+ "marginRight": 16,
+ "overflow": "hidden",
+ "width": 32,
}
}
+ testID="cellbase-avatar"
>
-
-
-
-
+
+
+
-
- Avalanche Mainnet C-Chain
-
-
+ Avalanche Mainnet C-Chain
+
@@ -805,6 +787,7 @@ exports[`Network Selector renders correctly 1`] = `
"backgroundColor": "#ffffff",
"borderRadius": 4,
"opacity": 1,
+ "padding": 16,
"position": "relative",
}
}
@@ -815,7 +798,9 @@ exports[`Network Selector renders correctly 1`] = `
accessible={true}
style={
{
- "padding": 16,
+ "alignItems": "center",
+ "flexDirection": "row",
+ "padding": 0,
}
}
>
@@ -831,70 +816,61 @@ exports[`Network Selector renders correctly 1`] = `
style={
{
"alignItems": "center",
- "flexDirection": "row",
+ "backgroundColor": "#ffffff",
+ "borderRadius": 16,
+ "height": 32,
+ "justifyContent": "center",
+ "marginRight": 16,
+ "overflow": "hidden",
+ "width": 32,
}
}
+ testID="cellbase-avatar"
>
-
-
-
-
+
+
+
-
- Polygon Mainnet
-
-
+ Polygon Mainnet
+
@@ -908,6 +884,7 @@ exports[`Network Selector renders correctly 1`] = `
"backgroundColor": "#ffffff",
"borderRadius": 4,
"opacity": 1,
+ "padding": 16,
"position": "relative",
}
}
@@ -918,7 +895,9 @@ exports[`Network Selector renders correctly 1`] = `
accessible={true}
style={
{
- "padding": 16,
+ "alignItems": "center",
+ "flexDirection": "row",
+ "padding": 0,
}
}
>
@@ -934,70 +913,61 @@ exports[`Network Selector renders correctly 1`] = `
style={
{
"alignItems": "center",
- "flexDirection": "row",
+ "backgroundColor": "#ffffff",
+ "borderRadius": 16,
+ "height": 32,
+ "justifyContent": "center",
+ "marginRight": 16,
+ "overflow": "hidden",
+ "width": 32,
}
}
+ testID="cellbase-avatar"
>
-
-
-
-
+
+
+
-
- Optimism
-
-
+ Optimism
+
@@ -1011,6 +981,7 @@ exports[`Network Selector renders correctly 1`] = `
"backgroundColor": "#ffffff",
"borderRadius": 4,
"opacity": 1,
+ "padding": 16,
"position": "relative",
}
}
@@ -1021,7 +992,9 @@ exports[`Network Selector renders correctly 1`] = `
accessible={true}
style={
{
- "padding": 16,
+ "alignItems": "center",
+ "flexDirection": "row",
+ "padding": 0,
}
}
>
@@ -1037,68 +1010,59 @@ exports[`Network Selector renders correctly 1`] = `
style={
{
"alignItems": "center",
- "flexDirection": "row",
+ "backgroundColor": "#f2f4f6",
+ "borderRadius": 16,
+ "borderWidth": 1,
+ "height": 32,
+ "justifyContent": "center",
+ "marginRight": 16,
+ "overflow": "hidden",
+ "width": 32,
}
}
+ testID="cellbase-avatar"
>
-
-
- G
-
-
-
+
+
+
-
- Gnosis Chain
-
-
+ Gnosis Chain
+
diff --git a/app/components/Views/Notifications/Details/Fields/NetworkFeeField.test.tsx b/app/components/Views/Notifications/Details/Fields/NetworkFeeField.test.tsx
index 7d2b8274b0d..de32edec86b 100644
--- a/app/components/Views/Notifications/Details/Fields/NetworkFeeField.test.tsx
+++ b/app/components/Views/Notifications/Details/Fields/NetworkFeeField.test.tsx
@@ -1,10 +1,17 @@
import React from 'react';
import { render } from '@testing-library/react-native';
import NetworkFeeField from './NetworkFeeField';
-import { ModalFieldType } from '../../../../../util/notifications';
-import { processNotification } from '@metamask/notification-services-controller/notification-services';
-import { createMockNotificationEthReceived } from '@metamask/notification-services-controller/notification-services/mocks';
+import { OnChainRawNotificationsWithNetworkFields } from '@metamask/notification-services-controller/dist/types/NotificationServicesController/types';
+import {
+ ModalFieldType,
+ type Notification,
+} from '../../../../../util/notifications';
+import { NotificationServicesController } from '@metamask/notification-services-controller';
+const {
+ Processors: { processNotification },
+ Mocks,
+} = NotificationServicesController;
jest.mock('../../../../../util/notifications/methods/common', () => ({
getNetworkFees: () =>
Promise.resolve({
@@ -20,8 +27,8 @@ jest.mock('../../../../../util/notifications/methods/common', () => ({
}));
const MOCK_NOTIFICATION = processNotification(
- createMockNotificationEthReceived(),
-);
+ Mocks.createMockNotificationEthReceived(),
+) as OnChainRawNotificationsWithNetworkFields;
describe('NetworkFeeField', () => {
const setIsCollapsed = jest.fn();
@@ -35,6 +42,7 @@ describe('NetworkFeeField', () => {
const { toJSON } = render(
@@ -50,7 +58,7 @@ describe('NetworkFeeField', () => {
chainId: '0x1',
})
}
- notification={MOCK_NOTIFICATION}
+ notification={MOCK_NOTIFICATION as Notification}
/>,
);
diff --git a/app/components/Views/Notifications/OptIn/index.test.tsx b/app/components/Views/Notifications/OptIn/index.test.tsx
index b643daaa7fb..bd62c3d961e 100644
--- a/app/components/Views/Notifications/OptIn/index.test.tsx
+++ b/app/components/Views/Notifications/OptIn/index.test.tsx
@@ -1,16 +1,13 @@
import React from 'react';
-import OptIn from '.';
+import OptIn from './';
import { RootState } from '../../../../reducers';
import { backgroundState } from '../../../../util/test/initial-root-state';
import renderWithProvider, {
DeepPartial,
} from '../../../../util/test/renderWithProvider';
-import { strings } from '../../../../../locales/i18n';
const mockedDispatch = jest.fn();
-
-
const mockInitialState: DeepPartial = {
settings: {},
engine: {
@@ -21,12 +18,14 @@ const mockInitialState: DeepPartial = {
},
},
},
- };
+};
- jest.mock('react-redux', () => ({
- ...jest.requireActual('react-redux'),
- useSelector: jest.fn().mockImplementation((selector) => selector(mockInitialState)),
- }));
+jest.mock('react-redux', () => ({
+ ...jest.requireActual('react-redux'),
+ // TODO: Replace "any" with type
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ useSelector: (fn: any) => fn(mockInitialState),
+}));
jest.mock('@react-navigation/native', () => {
const actualNav = jest.requireActual('@react-navigation/native');
@@ -39,82 +38,9 @@ jest.mock('@react-navigation/native', () => {
};
});
-jest.mock('../../../../actions/notification/helpers', () => ({
- enableNotificationServices: jest.fn(),
-}));
-
-jest.mock('../../../../components/hooks/useMetrics', () => ({
- useMetrics: () => ({
- trackEvent: jest.fn(),
- }),
-}));
-
-jest.mock('../../../../util/notifications/hooks/useNotifications', () => ({
- useEnableNotifications: () => ({
- enableNotifications: jest.fn(),
- }),
-}));
-
-jest.mock('react-native', () => ({
- Linking: {
- openURL: jest.fn(),
- },
-}));
-
-jest.mock('../../../../selectors/notifications', () => ({
- selectIsMetamaskNotificationsEnabled: jest.fn(),
-}));
-
-jest.mock('../../../../core/Analytics', () => ({
- MetaMetricsEvents: {
- NOTIFICATIONS_ACTIVATED: 'notifications_activated',
- },
-}));
-
-jest.mock('../../../../util/theme', () => ({
- useTheme: jest.fn(),
-}));
-
-jest.mock('../../../../selectors/notifications', () => ({
- selectIsProfileSyncingEnabled: jest.fn(),
-}));
-
describe('OptIn', () => {
-
- beforeEach(() => {
- jest.resetAllMocks();
- });
-
it('should render correctly', () => {
const { toJSON } = renderWithProvider();
expect(toJSON()).toMatchSnapshot();
});
-
- it('calls enableNotifications when the button is pressed', async () => {
- const { getByText } = renderWithProvider(
-
- );
-
- const button = getByText(strings('notifications.activation_card.cta'));
- expect(button).toBeDefined();
- });
-
- it('calls navigate when the cancel button is pressed', async () => {
- const { getByText } = renderWithProvider(
-
- );
-
- const button = getByText(strings('notifications.activation_card.cancel'));
- expect(button).toBeDefined();
- });
-
- it('calls trackEvent when the button is pressed', async () => {
- const { getByText } = renderWithProvider(
-
- );
-
- const button = getByText(strings('notifications.activation_card.cta'));
- expect(button).toBeDefined();
- });
});
-
diff --git a/app/components/Views/Notifications/OptIn/index.tsx b/app/components/Views/Notifications/OptIn/index.tsx
index 4c69eb7d7dd..d256d687df8 100644
--- a/app/components/Views/Notifications/OptIn/index.tsx
+++ b/app/components/Views/Notifications/OptIn/index.tsx
@@ -4,6 +4,7 @@ import { useNavigation } from '@react-navigation/native';
import { useMetrics } from '../../../../components/hooks/useMetrics';
import { MetaMetricsEvents } from '../../../../core/Analytics';
+import { AuthorizationStatus } from '@notifee/react-native';
import Button, {
ButtonVariants,
} from '../../../../component-library/components/Buttons/Button';
@@ -17,7 +18,10 @@ import EnableNotificationsCardPlaceholder from '../../../../images/enableNotific
import { createStyles } from './styles';
import Routes from '../../../../constants/navigation/Routes';
import { useSelector } from 'react-redux';
-import NotificationsService from '../../../../util/notifications/services/NotificationService';
+import {
+ asyncAlert,
+ requestPushNotificationsPermission,
+} from '../../../../util/notifications';
import AppConstants from '../../../../core/AppConstants';
import { RootState } from '../../../../reducers';
import { useEnableNotifications } from '../../../../util/notifications/hooks/useNotifications';
@@ -72,11 +76,14 @@ const OptIn = () => {
},
});
} else {
- const { permission } = await NotificationsService.getAllPermissions();
-
- if (permission !== 'authorized') {
- return;
- }
+ const nativeNotificationStatus = await requestPushNotificationsPermission(
+ asyncAlert,
+ );
+
+ if (
+ nativeNotificationStatus?.authorizationStatus ===
+ AuthorizationStatus.AUTHORIZED
+ ) {
/**
* Although this is an async function, we are dispatching an action (firing & forget)
* to emulate optimistic UI.
@@ -96,6 +103,7 @@ const OptIn = () => {
action_type: 'activated',
is_profile_syncing_enabled: isProfileSyncingEnabled,
});
+ }
}, [
basicFunctionalityEnabled,
enableNotifications,
diff --git a/app/components/Views/Notifications/index.tsx b/app/components/Views/Notifications/index.tsx
index 77d736afa4a..a38ffeb1b50 100644
--- a/app/components/Views/Notifications/index.tsx
+++ b/app/components/Views/Notifications/index.tsx
@@ -1,6 +1,7 @@
import React, { useCallback, useMemo } from 'react';
import { View } from 'react-native';
import { useSelector } from 'react-redux';
+import notifee from '@notifee/react-native';
import { useMetrics } from '../../../components/hooks/useMetrics';
import { NotificationsViewSelectorsIDs } from '../../../../e2e/selectors/NotificationsView.selectors';
import styles from './styles';
@@ -28,7 +29,6 @@ import {
useMarkNotificationAsRead,
} from '../../../util/notifications/hooks/useNotifications';
import { NavigationProp, ParamListBase } from '@react-navigation/native';
-import NotificationsService from '../../../util/notifications/services/NotificationService';
import ButtonIcon, {
ButtonIconSizes,
} from '../../../component-library/components/Buttons/ButtonIcon';
@@ -53,7 +53,7 @@ const NotificationsView = ({
const handleMarkAllAsRead = useCallback(() => {
markNotificationAsRead(notifications);
- NotificationsService.setBadgeCount(0);
+ notifee.setBadgeCount(0);
trackEvent(MetaMetricsEvents.NOTIFICATIONS_MARKED_ALL_AS_READ);
}, [markNotificationAsRead, notifications, trackEvent]);
@@ -143,7 +143,7 @@ NotificationsView.navigationOptions = ({
/>
),
headerTitle: () => (
-
+
{strings('app_settings.notifications_title')}
),
diff --git a/app/components/Views/Notifications/styles.ts b/app/components/Views/Notifications/styles.ts
index a803a435637..fa14c20c8d2 100644
--- a/app/components/Views/Notifications/styles.ts
+++ b/app/components/Views/Notifications/styles.ts
@@ -12,7 +12,6 @@ const styles = StyleSheet.create({
position: 'absolute',
},
icon: { marginHorizontal: 16 },
- title: { alignSelf: 'center' },
});
export default styles;
diff --git a/app/components/Views/OnboardingCarousel/__snapshots__/index.test.tsx.snap b/app/components/Views/OnboardingCarousel/__snapshots__/index.test.tsx.snap
index 761bd88f873..b400a2c0740 100644
--- a/app/components/Views/OnboardingCarousel/__snapshots__/index.test.tsx.snap
+++ b/app/components/Views/OnboardingCarousel/__snapshots__/index.test.tsx.snap
@@ -1,713 +1,32 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`OnboardingCarousel should render correctly 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
- Welcome to MetaMask
-
-
-
- Trusted by millions, MetaMask is a secure wallet making the world of web3 accessible to all.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Get started
-
-
-
-
-
-
-
-`;
-
-exports[`OnboardingCarousel should render the App Start Time text when isTest is true 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
- Welcome to MetaMask
-
-
-
- Trusted by millions, MetaMask is a secure wallet making the world of web3 accessible to all.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Get started
-
-
-
-
-
-
-
+
+
`;
diff --git a/app/components/Views/OnboardingCarousel/index.js b/app/components/Views/OnboardingCarousel/index.js
new file mode 100644
index 00000000000..a2c4b29d44b
--- /dev/null
+++ b/app/components/Views/OnboardingCarousel/index.js
@@ -0,0 +1,273 @@
+import React, { PureComponent } from 'react';
+import PropTypes from 'prop-types';
+import {
+ Text,
+ View,
+ ScrollView,
+ StyleSheet,
+ Image,
+ Dimensions,
+ Platform,
+} from 'react-native';
+import { MetaMetricsEvents } from '../../../core/Analytics';
+import StyledButton from '../../UI/StyledButton';
+import { fontStyles, baseStyles } from '../../../styles/common';
+import { strings } from '../../../../locales/i18n';
+import FadeOutOverlay from '../../UI/FadeOutOverlay';
+import ScrollableTabView from 'react-native-scrollable-tab-view';
+import { getTransparentOnboardingNavbarOptions } from '../../UI/Navbar';
+import OnboardingScreenWithBg from '../../UI/OnboardingScreenWithBg';
+import Device from '../../../util/device';
+import { saveOnboardingEvent } from '../../../actions/onboarding';
+import { connect } from 'react-redux';
+import { ThemeContext, mockTheme } from '../../../util/theme';
+import { WELCOME_SCREEN_CAROUSEL_TITLE_ID } from '../../../../wdio/screen-objects/testIDs/Screens/WelcomeScreen.testIds';
+import { OnboardingCarouselSelectorIDs } from '../../../../e2e/selectors/Onboarding/OnboardingCarousel.selectors';
+import generateTestId from '../../../../wdio/utils/generateTestId';
+import trackOnboarding from '../../../util/metrics/TrackOnboarding/trackOnboarding';
+
+const IMAGE_3_RATIO = 215 / 315;
+const IMAGE_2_RATIO = 222 / 239;
+const IMAGE_1_RATIO = 285 / 203;
+const DEVICE_WIDTH = Dimensions.get('window').width;
+
+const IMG_PADDING = Device.isIphoneX() ? 100 : Device.isIphone5S() ? 180 : 220;
+
+const createStyles = (colors) =>
+ StyleSheet.create({
+ scroll: {
+ flexGrow: 1,
+ },
+ wrapper: {
+ paddingVertical: 30,
+ flex: 1,
+ },
+ title: {
+ fontSize: 24,
+ marginBottom: 12,
+ color: colors.text.default,
+ justifyContent: 'center',
+ textAlign: 'center',
+ ...fontStyles.bold,
+ },
+ subtitle: {
+ fontSize: 14,
+ lineHeight: 19,
+ marginTop: 12,
+ marginBottom: 25,
+ color: colors.text.alternative,
+ justifyContent: 'center',
+ textAlign: 'center',
+ ...fontStyles.normal,
+ },
+ ctas: {
+ paddingHorizontal: 40,
+ paddingBottom: Device.isIphoneX() ? 40 : 20,
+ flexDirection: 'column',
+ },
+ ctaWrapper: {
+ justifyContent: 'flex-end',
+ },
+ carouselImage: {},
+ // eslint-disable-next-line react-native/no-unused-styles
+ carouselImage1: {
+ marginTop: 30,
+ width: DEVICE_WIDTH - IMG_PADDING,
+ height: (DEVICE_WIDTH - IMG_PADDING) * IMAGE_1_RATIO,
+ },
+ // eslint-disable-next-line react-native/no-unused-styles
+ carouselImage2: {
+ width: DEVICE_WIDTH - IMG_PADDING,
+ height: (DEVICE_WIDTH - IMG_PADDING) * IMAGE_2_RATIO,
+ },
+ // eslint-disable-next-line react-native/no-unused-styles
+ carouselImage3: {
+ width: DEVICE_WIDTH - 60,
+ height: (DEVICE_WIDTH - 60) * IMAGE_3_RATIO,
+ },
+ carouselImageWrapper: {
+ flex: 1,
+ flexDirection: 'row',
+ alignItems: 'center',
+ justifyContent: 'center',
+ },
+ circle: {
+ width: 8,
+ height: 8,
+ borderRadius: 8 / 2,
+ backgroundColor: colors.icon.default,
+ opacity: 0.4,
+ marginHorizontal: 8,
+ },
+ solidCircle: {
+ opacity: 1,
+ },
+ progessContainer: {
+ flexDirection: 'row',
+ alignSelf: 'center',
+ marginVertical: 36,
+ },
+ tab: {
+ marginHorizontal: 30,
+ },
+ });
+
+const onboarding_carousel_1 = require('../../../images/onboarding-carousel-1.png'); // eslint-disable-line
+const onboarding_carousel_2 = require('../../../images/onboarding-carousel-2.png'); // eslint-disable-line
+const onboarding_carousel_3 = require('../../../images/onboarding-carousel-3.png'); // eslint-disable-line
+
+const carousel_images = [
+ onboarding_carousel_1,
+ onboarding_carousel_2,
+ onboarding_carousel_3,
+];
+
+/**
+ * View that is displayed to first time (new) users
+ */
+class OnboardingCarousel extends PureComponent {
+ static propTypes = {
+ /**
+ * The navigator object
+ */
+ navigation: PropTypes.object,
+ /**
+ * Save onboarding event to state
+ */
+ saveOnboardingEvent: PropTypes.func,
+ };
+
+ state = {
+ currentTab: 1,
+ };
+
+ track = (event, properties) => {
+ trackOnboarding(event, properties, this.props.saveOnboardingEvent);
+ };
+
+ onPressGetStarted = () => {
+ this.props.navigation.navigate('Onboarding');
+ this.track(MetaMetricsEvents.ONBOARDING_STARTED);
+ };
+
+ renderTabBar = () => ;
+
+ onChangeTab = (obj) => {
+ this.setState({ currentTab: obj.i + 1 });
+ this.track(MetaMetricsEvents.ONBOARDING_WELCOME_SCREEN_ENGAGEMENT, {
+ message_title: strings(`onboarding_carousel.title${[obj.i + 1]}`, {
+ locale: 'en',
+ }),
+ });
+ };
+
+ updateNavBar = () => {
+ const colors = this.context.colors || mockTheme.colors;
+ this.props.navigation.setOptions(
+ getTransparentOnboardingNavbarOptions(colors),
+ );
+ };
+
+ componentDidMount = () => {
+ this.updateNavBar();
+ this.track(MetaMetricsEvents.ONBOARDING_WELCOME_MESSAGE_VIEWED);
+ };
+
+ componentDidUpdate = () => {
+ this.updateNavBar();
+ };
+
+ render() {
+ const { currentTab } = this.state;
+ const colors = this.context.colors || mockTheme.colors;
+ const styles = createStyles(colors);
+
+ return (
+
+
+
+
+
+ {['one', 'two', 'three'].map((value, index) => {
+ const key = index + 1;
+ const imgStyleKey = `carouselImage${key}`;
+ return (
+
+
+
+ {strings(`onboarding_carousel.title${key}`)}
+
+
+ {strings(`onboarding_carousel.subtitle${key}`)}
+
+
+
+
+
+
+ );
+ })}
+
+
+
+ {[1, 2, 3].map((i) => (
+
+ ))}
+
+
+
+
+
+
+ {strings('onboarding_carousel.get_started')}
+
+
+
+
+
+
+ );
+ }
+}
+
+OnboardingCarousel.contextType = ThemeContext;
+
+const mapDispatchToProps = (dispatch) => ({
+ saveOnboardingEvent: (...eventArgs) =>
+ dispatch(saveOnboardingEvent(eventArgs)),
+});
+
+export default connect(null, mapDispatchToProps)(OnboardingCarousel);
diff --git a/app/components/Views/OnboardingCarousel/index.test.tsx b/app/components/Views/OnboardingCarousel/index.test.tsx
index a6521a3c26a..8d6ca7d7aa2 100644
--- a/app/components/Views/OnboardingCarousel/index.test.tsx
+++ b/app/components/Views/OnboardingCarousel/index.test.tsx
@@ -1,41 +1,20 @@
import React from 'react';
-import { waitFor } from '@testing-library/react-native';
+import { shallow } from 'enzyme';
import OnboardingCarousel from './';
-import { NavigationProp, ParamListBase } from '@react-navigation/native';
-import { PerformanceRegressionSelectorIDs } from '../../../../e2e/selectors/PerformanceRegression.selectors';
-import renderWithProvider from '../../../util/test/renderWithProvider';
-
-jest.mock('../../../util/metrics/TrackOnboarding/trackOnboarding');
-jest.mock('../../../util/test/utils', () => ({
- isTest: true,
-}));
-
-const mockNavigate: jest.Mock = jest.fn();
-const mockSetOptions: jest.Mock = jest.fn();
-const mockNavigation = {
- navigate: mockNavigate,
- setOptions: mockSetOptions,
-} as unknown as NavigationProp;
+import { Provider } from 'react-redux';
+import createMockStore from 'redux-mock-store';
+const mockStore = createMockStore();
+const initialState = {};
+const store = mockStore(initialState);
describe('OnboardingCarousel', () => {
it('should render correctly', () => {
- const { toJSON } = renderWithProvider(
-
+ const wrapper = shallow(
+
+
+ ,
);
- expect(toJSON()).toMatchSnapshot();
- });
-
- it('should render the App Start Time text when isTest is true', async () => {
- const { toJSON, getByTestId } = renderWithProvider(
-
- );
- expect(toJSON()).toMatchSnapshot();
-
- await waitFor(() => {
- expect(
- getByTestId(PerformanceRegressionSelectorIDs.APP_START_TIME_ID),
- ).toBeTruthy();
- });
+ expect(wrapper).toMatchSnapshot();
});
});
diff --git a/app/components/Views/OnboardingCarousel/index.tsx b/app/components/Views/OnboardingCarousel/index.tsx
deleted file mode 100644
index 0641aa1e98b..00000000000
--- a/app/components/Views/OnboardingCarousel/index.tsx
+++ /dev/null
@@ -1,302 +0,0 @@
-import React, { useState, useEffect, useContext, useCallback } from 'react';
-import {
- Text,
- View,
- ScrollView,
- StyleSheet,
- Image,
- Dimensions,
- Platform,
-} from 'react-native';
-import type { ThemeColors } from '@metamask/design-tokens/dist/types/js/themes/types';
-import { NavigationProp, ParamListBase } from '@react-navigation/native';
-import { MetaMetricsEvents, IMetaMetricsEvent } from '../../../core/Analytics';
-import StyledButton from '../../UI/StyledButton';
-import { fontStyles, baseStyles } from '../../../styles/common';
-import { strings } from '../../../../locales/i18n';
-import FadeOutOverlay from '../../UI/FadeOutOverlay';
-import ScrollableTabView from 'react-native-scrollable-tab-view';
-import { getTransparentOnboardingNavbarOptions } from '../../UI/Navbar';
-import OnboardingScreenWithBg from '../../UI/OnboardingScreenWithBg';
-import Device from '../../../util/device';
-import { connect } from 'react-redux';
-import { ThemeContext, mockTheme } from '../../../util/theme';
-import { WELCOME_SCREEN_CAROUSEL_TITLE_ID } from '../../../../wdio/screen-objects/testIDs/Screens/WelcomeScreen.testIds';
-import { OnboardingCarouselSelectorIDs } from '../../../../e2e/selectors/Onboarding/OnboardingCarousel.selectors';
-import generateTestId from '../../../../wdio/utils/generateTestId';
-import trackOnboarding from '../../../util/metrics/TrackOnboarding/trackOnboarding';
-import { isTest } from '../../../util/test/utils';
-import StorageWrapper from '../../../store/storage-wrapper';
-import { PerformanceRegressionSelectorIDs } from '../../../../e2e/selectors/PerformanceRegression.selectors';
-import { JsonMap } from '@segment/analytics-react-native';
-import { Dispatch } from 'redux';
-import {
- saveOnboardingEvent as SaveEvent,
- OnboardingActionTypes,
-} from '../../../actions/onboarding';
-
-const IMAGE_3_RATIO = 215 / 315;
-const IMAGE_2_RATIO = 222 / 239;
-const IMAGE_1_RATIO = 285 / 203;
-const DEVICE_WIDTH = Dimensions.get('window').width;
-
-const IMG_PADDING = Device.isIphoneX() ? 100 : Device.isIphone5S() ? 180 : 220;
-
-const createStyles = (colors: ThemeColors) =>
- StyleSheet.create({
- scroll: {
- flexGrow: 1,
- },
- wrapper: {
- paddingVertical: 30,
- flex: 1,
- },
- title: {
- fontSize: 24,
- marginBottom: 12,
- color: colors.text.default,
- justifyContent: 'center',
- textAlign: 'center',
- ...fontStyles.bold,
- },
- subtitle: {
- fontSize: 14,
- lineHeight: 19,
- marginTop: 12,
- marginBottom: 25,
- color: colors.text.alternative,
- justifyContent: 'center',
- textAlign: 'center',
- ...fontStyles.normal,
- },
- ctas: {
- paddingHorizontal: 40,
- paddingBottom: Device.isIphoneX() ? 40 : 20,
- flexDirection: 'column',
- },
- ctaWrapper: {
- justifyContent: 'flex-end',
- },
- carouselImage: {},
- // eslint-disable-next-line react-native/no-unused-styles
- carouselImage1: {
- marginTop: 30,
- width: DEVICE_WIDTH - IMG_PADDING,
- height: (DEVICE_WIDTH - IMG_PADDING) * IMAGE_1_RATIO,
- },
- // eslint-disable-next-line react-native/no-unused-styles
- carouselImage2: {
- width: DEVICE_WIDTH - IMG_PADDING,
- height: (DEVICE_WIDTH - IMG_PADDING) * IMAGE_2_RATIO,
- },
- // eslint-disable-next-line react-native/no-unused-styles
- carouselImage3: {
- width: DEVICE_WIDTH - 60,
- height: (DEVICE_WIDTH - 60) * IMAGE_3_RATIO,
- },
- carouselImageWrapper: {
- flex: 1,
- flexDirection: 'row',
- alignItems: 'center',
- justifyContent: 'center',
- },
- circle: {
- width: 8,
- height: 8,
- borderRadius: 8 / 2,
- backgroundColor: colors.icon.default,
- opacity: 0.4,
- marginHorizontal: 8,
- },
- solidCircle: {
- opacity: 1,
- },
- progessContainer: {
- flexDirection: 'row',
- alignSelf: 'center',
- marginVertical: 36,
- },
- tab: {
- marginHorizontal: 30,
- },
- metricsWrapper: {
- flex: 1,
- marginTop: 12,
- marginBottom: 25,
- },
- metricsData: {
- fontSize: 10,
- color: colors.text.alternative,
- textAlign: 'center',
- },
- });
-
-const onboarding_carousel_1 = require('../../../images/onboarding-carousel-1.png'); // eslint-disable-line
-const onboarding_carousel_2 = require('../../../images/onboarding-carousel-2.png'); // eslint-disable-line
-const onboarding_carousel_3 = require('../../../images/onboarding-carousel-3.png'); // eslint-disable-line
-
-const carousel_images = [
- onboarding_carousel_1,
- onboarding_carousel_2,
- onboarding_carousel_3,
-];
-
-interface OnboardingCarouselProps {
- navigation: NavigationProp;
- saveOnboardingEvent: (...eventArgs: [IMetaMetricsEvent]) => void;
-}
-/**
- * View that is displayed to first time (new) users
- */
-export const OnboardingCarousel: React.FC = ({
- navigation,
- saveOnboardingEvent,
-}) => {
- const [currentTab, setCurrentTab] = useState(1);
- const [appStartTime, setAppStartTime] = useState(
- undefined,
- );
- const themeContext = useContext(ThemeContext);
- const colors = themeContext.colors || mockTheme.colors;
- const styles = createStyles(colors);
-
- const track = useCallback(
- (event: IMetaMetricsEvent, properties: JsonMap = {}) => {
- trackOnboarding(event, properties, saveOnboardingEvent);
- },
- [saveOnboardingEvent],
- );
-
- const onPressGetStarted = () => {
- navigation.navigate('Onboarding');
- track(MetaMetricsEvents.ONBOARDING_STARTED);
- };
-
- const renderTabBar = () => ;
-
- const onChangeTab = (obj: { i: number }) => {
- setCurrentTab(obj.i + 1);
- track(MetaMetricsEvents.ONBOARDING_WELCOME_SCREEN_ENGAGEMENT, {
- message_title: strings(`onboarding_carousel.title${[obj.i + 1]}`, {
- locale: 'en',
- }),
- });
- };
-
- const updateNavBar = useCallback(() => {
- navigation.setOptions(getTransparentOnboardingNavbarOptions(colors));
- }, [navigation, colors]);
-
- const initialize = useCallback(async () => {
- updateNavBar();
- track(MetaMetricsEvents.ONBOARDING_WELCOME_MESSAGE_VIEWED);
- const newAppStartTime = await StorageWrapper.getItem('appStartTime');
- setAppStartTime(newAppStartTime);
- }, [updateNavBar, track]);
-
- useEffect(() => {
- initialize();
- }, [initialize]);
-
- useEffect(() => {
- updateNavBar();
- }, [colors, updateNavBar]);
-
- return (
-
-
-
-
-
- {['one', 'two', 'three'].map((value, index) => {
- const key = index + 1;
- const imgStyleKey =
- `carouselImage${key}` as keyof typeof styles;
- return (
-
-
-
- {strings(`onboarding_carousel.title${key}`)}
-
- {isTest && (
- // This Text component is used to grab the App Start Time for our E2E test
- // ColdStartToOnboardingScreen.feature
-
- {appStartTime}
-
- )}
-
- {strings(`onboarding_carousel.subtitle${key}`)}
-
-
-
-
-
-
- );
- })}
-
-
-
- {[1, 2, 3].map((i) => (
-
- ))}
-
-
-
-
-
-
- {strings('onboarding_carousel.get_started')}
-
-
-
-
-
-
- );
-};
-
-const mapDispatchToProps = (dispatch: Dispatch) => ({
- saveOnboardingEvent: (...eventArgs: [IMetaMetricsEvent]) =>
- dispatch(SaveEvent(eventArgs)),
-});
-
-export default connect(null, mapDispatchToProps)(OnboardingCarousel);
diff --git a/app/components/Views/PickComponent/index.tsx b/app/components/Views/PickComponent/index.js
similarity index 65%
rename from app/components/Views/PickComponent/index.tsx
rename to app/components/Views/PickComponent/index.js
index bfebabcff60..e35cccdbf3b 100644
--- a/app/components/Views/PickComponent/index.tsx
+++ b/app/components/Views/PickComponent/index.js
@@ -1,11 +1,11 @@
import React, { PureComponent } from 'react';
+import PropTypes from 'prop-types';
import { StyleSheet, View } from 'react-native';
import { baseStyles } from '../../../styles/common';
import { ThemeContext, mockTheme } from '../../../util/theme';
import RadioButton from '../../../component-library/components/RadioButton/RadioButton';
-import { Theme } from '@metamask/design-tokens';
-const createStyles = (_colors: Theme['colors']) =>
+const createStyles = (colors) =>
StyleSheet.create({
root: {
...baseStyles.flexGrow,
@@ -16,38 +16,36 @@ const createStyles = (_colors: Theme['colors']) =>
},
});
-interface PickComponentProps {
- /**
- * Callback to pick an option
- */
- pick?: (value: string) => void;
- /**
- * Text to first option
- */
- textFirst: string;
- /**
- * Value of first option
- */
- valueFirst: string;
- /**
- * Text to second option
- */
- textSecond: string;
- /**
- * Value of second option
- */
- valueSecond: string;
- /**
- * Current selected value
- */
- selectedValue: string;
-}
-
/**
- * Component that allows to select clicking two options
+ * Componets that allows to select clicking two options
*/
-export default class PickComponent extends PureComponent {
- static contextType = ThemeContext;
+export default class PickComponent extends PureComponent {
+ static propTypes = {
+ /**
+ * Callback to pick an option
+ */
+ pick: PropTypes.func,
+ /**
+ * Text to first option
+ */
+ textFirst: PropTypes.string,
+ /**
+ * Value of first option
+ */
+ valueFirst: PropTypes.string,
+ /**
+ * Text to second option
+ */
+ textSecond: PropTypes.string,
+ /**
+ * Value of second option
+ */
+ valueSecond: PropTypes.string,
+ /**
+ * Current selected value
+ */
+ selectedValue: PropTypes.string,
+ };
pickFirst = () => {
const { pick, valueFirst } = this.props;
@@ -85,3 +83,5 @@ export default class PickComponent extends PureComponent {
);
};
}
+
+PickComponent.contextType = ThemeContext;
diff --git a/app/components/Views/Settings/AdvancedSettings/__snapshots__/index.test.tsx.snap b/app/components/Views/Settings/AdvancedSettings/__snapshots__/index.test.tsx.snap
index 1f1923e0c31..943cc45a4d4 100644
--- a/app/components/Views/Settings/AdvancedSettings/__snapshots__/index.test.tsx.snap
+++ b/app/components/Views/Settings/AdvancedSettings/__snapshots__/index.test.tsx.snap
@@ -456,6 +456,7 @@ exports[`AdvancedSettings should render correctly 1`] = `
"marginTop": 32,
}
}
+ testID="token-detection-toggle"
>
- Autodetect tokens
+ Enhanced Token Detection
StyleSheet.create({
@@ -169,6 +169,14 @@ class AdvancedSettings extends PureComponent {
* Entire redux state used to generate state logs
*/
fullState: PropTypes.object,
+ /**
+ * ChainID of network
+ */
+ chainId: PropTypes.string,
+ /**
+ * Boolean that checks if token detection is enabled
+ */
+ isTokenDetectionEnabled: PropTypes.bool,
/**
* Object that represents the current route info like params passed to it
*/
@@ -255,6 +263,47 @@ class AdvancedSettings extends PureComponent {
PreferencesController.setUseTokenDetection(detectionStatus);
};
+ renderTokenDetectionSection = () => {
+ const { isTokenDetectionEnabled, chainId } = this.props;
+ const { styles, colors } = this.getStyles();
+ const theme = this.context || mockTheme;
+ if (!isTokenDetectionSupportedForNetwork(chainId)) {
+ return null;
+ }
+ return (
+
+
+
+ {strings('app_settings.token_detection_title')}
+
+
+
+
+
+
+ {strings('app_settings.token_detection_description')}
+
+
+ );
+ };
+
toggleSmartTransactionsOptInStatus = (smartTransactionsOptInStatus) => {
const { PreferencesController } = Engine.context;
PreferencesController.setSmartTransactionsOptInStatus(
@@ -428,7 +477,7 @@ class AdvancedSettings extends PureComponent {
{strings('app_settings.custom_nonce_desc')}
-
+ {this.renderTokenDetectionSection()}
diff --git a/app/components/Views/Settings/AutoDetectNFTSettings/__snapshots__/index.test.tsx.snap b/app/components/Views/Settings/AutoDetectNFTSettings/__snapshots__/index.test.tsx.snap
deleted file mode 100644
index 16f08a0bb24..00000000000
--- a/app/components/Views/Settings/AutoDetectNFTSettings/__snapshots__/index.test.tsx.snap
+++ /dev/null
@@ -1,89 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`AutoDetectNFTSettings should render correctly 1`] = `
-
-
-
- Autodetect NFTs
-
-
-
-
-
-
- Let MetaMask add NFTs you own using third-party services (like OpenSea). Autodetecting NFTs exposes your IP and account address to these services. Enabling this feature could associate your IP address with your Ethereum address and display fake NFTs airdropped by scammers. You can add tokens manually to avoid this risk.
-
-
-`;
diff --git a/app/components/Views/Settings/AutoDetectNFTSettings/index.constants.ts b/app/components/Views/Settings/AutoDetectNFTSettings/index.constants.ts
deleted file mode 100644
index f3047aa77ef..00000000000
--- a/app/components/Views/Settings/AutoDetectNFTSettings/index.constants.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export const NFT_AUTO_DETECT_MODE_SECTION =
- 'nft-opensea-autodetect-mode-section';
diff --git a/app/components/Views/Settings/AutoDetectNFTSettings/index.styles.ts b/app/components/Views/Settings/AutoDetectNFTSettings/index.styles.ts
deleted file mode 100644
index a7b2f4d82a8..00000000000
--- a/app/components/Views/Settings/AutoDetectNFTSettings/index.styles.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { StyleSheet } from 'react-native';
-
-const createStyles = () =>
- StyleSheet.create({
- titleContainer: {
- flexDirection: 'row',
- alignItems: 'center',
- },
- title: {
- flex: 1,
- },
- switchElement: {
- marginLeft: 16,
- },
- switch: {
- alignSelf: 'flex-start',
- },
- halfSetting: {
- marginTop: 16,
- },
- desc: {
- marginTop: 8,
- },
- setting: {
- marginTop: 32,
- },
- });
-
-export default createStyles;
diff --git a/app/components/Views/Settings/AutoDetectNFTSettings/index.test.tsx b/app/components/Views/Settings/AutoDetectNFTSettings/index.test.tsx
deleted file mode 100644
index fa84909edfa..00000000000
--- a/app/components/Views/Settings/AutoDetectNFTSettings/index.test.tsx
+++ /dev/null
@@ -1,158 +0,0 @@
-// Third party dependencies
-import React from 'react';
-import { fireEvent } from '@testing-library/react-native';
-import { useNavigation } from '@react-navigation/native';
-
-// External dependencies
-import Engine from '../../../../core/Engine';
-import renderWithProvider from '../../../../util/test/renderWithProvider';
-import { backgroundState } from '../../../../util/test/initial-root-state';
-
-// Internal dependencies
-import AutoDetectNFTSettings from './index';
-import { NFT_AUTO_DETECT_MODE_SECTION } from './index.constants';
-
-let mockSetDisplayNftMedia: jest.Mock;
-let mockSetUseNftDetection: jest.Mock;
-let mockAddTraitsToUser: jest.Mock;
-let mockTrackEvent: jest.Mock;
-
-beforeEach(() => {
- mockSetDisplayNftMedia.mockClear();
- mockSetUseNftDetection.mockClear();
- mockAddTraitsToUser.mockClear();
- mockTrackEvent.mockClear();
-});
-
-const mockEngine = Engine;
-
-jest.mock('../../../../core/Engine', () => {
- mockSetDisplayNftMedia = jest.fn();
- mockSetUseNftDetection = jest.fn();
- mockAddTraitsToUser = jest.fn();
- mockTrackEvent = jest.fn();
- return {
- init: () => mockEngine.init({}),
- context: {
- PreferencesController: {
- setDisplayNftMedia: mockSetDisplayNftMedia,
- setUseNftDetection: mockSetUseNftDetection,
- },
- },
- };
-});
-
-const mockNavigation = {
- goBack: jest.fn(),
- setOptions: jest.fn(),
-};
-
-jest.mock('@react-navigation/native', () => ({
- ...jest.requireActual('@react-navigation/native'),
- useNavigation: jest.fn(() => mockNavigation),
-}));
-
-jest.mock('../../../hooks/useMetrics', () => ({
- useMetrics: () => ({
- addTraitsToUser: mockAddTraitsToUser,
- trackEvent: mockTrackEvent,
- }),
- MetaMetricsEvents: {
- NFT_AUTO_DETECTION_ENABLED: 'NFT_AUTO_DETECTION_ENABLED',
- },
-}));
-
-jest.mock('../../../../util/general', () => ({
- timeoutFetch: jest.fn(),
-}));
-
-describe('AutoDetectNFTSettings', () => {
- beforeEach(() => {
- jest.clearAllMocks();
- (useNavigation as jest.Mock).mockImplementation(() => mockNavigation);
- });
-
- const initialState = {
- engine: {
- backgroundState: {
- ...backgroundState,
- PreferencesController: {
- ...backgroundState.PreferencesController,
- useTokenDetection: true,
- displayNftMedia: false,
- useNftDetection: false,
- },
- },
- },
- network: {
- provider: {
- chainId: '1',
- },
- },
- };
-
- it('should render correctly', () => {
- const tree = renderWithProvider(, {
- state: initialState,
- });
- expect(tree).toMatchSnapshot();
- });
-
- describe('NFT Autodetection', () => {
- it('should render NFT autodetection switch', () => {
- const { getByTestId } = renderWithProvider(, {
- state: initialState,
- });
- const autoDetectSwitch = getByTestId(NFT_AUTO_DETECT_MODE_SECTION);
- expect(autoDetectSwitch).toBeTruthy();
- });
-
- it('should toggle NFT autodetection when switch is pressed', () => {
- const { getByTestId } = renderWithProvider(, {
- state: initialState,
- });
- const autoDetectSwitch = getByTestId(NFT_AUTO_DETECT_MODE_SECTION);
- fireEvent(autoDetectSwitch, 'onValueChange', true);
-
- expect(
- Engine.context.PreferencesController.setUseNftDetection,
- ).toHaveBeenCalledWith(true);
- expect(
- Engine.context.PreferencesController.setDisplayNftMedia,
- ).toHaveBeenCalledWith(true);
- expect(mockAddTraitsToUser).toHaveBeenCalledWith({
- 'NFT Autodetection': 'ON',
- });
- expect(mockTrackEvent).toHaveBeenCalledWith(
- 'NFT_AUTO_DETECTION_ENABLED',
- {
- 'NFT Autodetection': 'ON',
- location: 'app_settings',
- },
- );
- });
-
- it('should not enable display NFT media when autodetection is turned off', () => {
- const { getByTestId } = renderWithProvider(, {
- state: initialState,
- });
- const autoDetectSwitch = getByTestId(NFT_AUTO_DETECT_MODE_SECTION);
- expect(autoDetectSwitch).toBeTruthy();
-
- fireEvent(autoDetectSwitch, 'onValueChange', false);
-
- expect(mockSetUseNftDetection).toHaveBeenCalledWith(false);
- expect(mockSetDisplayNftMedia).not.toHaveBeenCalled();
- expect(mockAddTraitsToUser).toHaveBeenCalledWith({
- 'NFT Autodetection': 'OFF',
- });
- expect(mockTrackEvent).toHaveBeenCalledWith(
- 'NFT_AUTO_DETECTION_ENABLED',
- {
- 'NFT Autodetection': 'OFF',
- location: 'app_settings',
- },
- );
- });
- });
-});
diff --git a/app/components/Views/Settings/AutoDetectNFTSettings/index.tsx b/app/components/Views/Settings/AutoDetectNFTSettings/index.tsx
deleted file mode 100644
index 0cc7ecbe88d..00000000000
--- a/app/components/Views/Settings/AutoDetectNFTSettings/index.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-// Third party dependencies
-import React, { useCallback } from 'react';
-import { View, Switch } from 'react-native';
-import { useSelector } from 'react-redux';
-
-// External dependencies
-import Engine from '../../../../core/Engine';
-import { selectUseNftDetection } from '../../../../selectors/preferencesController';
-import { useTheme } from '../../../../util/theme';
-import { strings } from '../../../../../locales/i18n';
-import { MetaMetricsEvents, useMetrics } from '../../../hooks/useMetrics';
-import Text, {
- TextVariant,
- TextColor,
-} from '../../../../component-library/components/Texts/Text';
-import { UserProfileProperty } from '../../../../util/metrics/UserSettingsAnalyticsMetaData/UserProfileAnalyticsMetaData.types';
-
-// Internal dependencies
-import createStyles from './index.styles';
-import { NFT_AUTO_DETECT_MODE_SECTION } from './index.constants';
-
-const AutoDetectNFTSettings = () => {
- const { trackEvent, addTraitsToUser } = useMetrics();
- const theme = useTheme();
- const { colors } = theme;
- const styles = createStyles();
-
- const useNftDetection = useSelector(selectUseNftDetection);
-
- const toggleNftAutodetect = useCallback(
- (value: boolean) => {
- const { PreferencesController } = Engine.context;
- if (value) {
- PreferencesController.setDisplayNftMedia(value);
- }
- PreferencesController.setUseNftDetection(value);
- const traits = {
- [UserProfileProperty.NFT_AUTODETECTION]: value
- ? UserProfileProperty.ON
- : UserProfileProperty.OFF,
- };
- addTraitsToUser(traits);
- trackEvent(MetaMetricsEvents.NFT_AUTO_DETECTION_ENABLED, {
- ...traits,
- location: 'app_settings',
- });
- },
- [addTraitsToUser, trackEvent],
- );
-
- return (
-
-
-
- {strings('app_settings.nft_autodetect_mode')}
-
-
-
-
-
-
- {strings('app_settings.autodetect_nft_desc')}
-
-
- );
-};
-
-export default AutoDetectNFTSettings;
diff --git a/app/components/Views/Settings/AutoDetectTokensSettings/__snapshots__/index.test.tsx.snap b/app/components/Views/Settings/AutoDetectTokensSettings/__snapshots__/index.test.tsx.snap
deleted file mode 100644
index 180daab2501..00000000000
--- a/app/components/Views/Settings/AutoDetectTokensSettings/__snapshots__/index.test.tsx.snap
+++ /dev/null
@@ -1,91 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`AssetSettings should render correctly 1`] = `
-
-
-
- Autodetect tokens
-
-
-
-
-
-
- We use third-party APIs to detect and display new tokens sent to your wallet. Turn off if you don’t want the app to pull data from those services.
-
-
-`;
diff --git a/app/components/Views/Settings/AutoDetectTokensSettings/index.constants.ts b/app/components/Views/Settings/AutoDetectTokensSettings/index.constants.ts
deleted file mode 100644
index e3ae2d01629..00000000000
--- a/app/components/Views/Settings/AutoDetectTokensSettings/index.constants.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const TOKEN_DETECTION_TOGGLE = 'token-detection-toggle';
diff --git a/app/components/Views/Settings/AutoDetectTokensSettings/index.styles.ts b/app/components/Views/Settings/AutoDetectTokensSettings/index.styles.ts
deleted file mode 100644
index 6a79c3498eb..00000000000
--- a/app/components/Views/Settings/AutoDetectTokensSettings/index.styles.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// Third party dependencies.
-import { StyleSheet } from 'react-native';
-
-const styleSheet = () =>
- StyleSheet.create({
- setting: {
- marginTop: 32,
- },
- titleContainer: {
- flexDirection: 'row',
- alignItems: 'center',
- },
- title: {
- flex: 1,
- },
- toggle: {
- flexDirection: 'row',
- alignItems: 'center',
- marginLeft: 16,
- },
- switch: {
- alignSelf: 'flex-start',
- },
- desc: {
- marginTop: 8,
- },
- });
-
-export default styleSheet;
diff --git a/app/components/Views/Settings/AutoDetectTokensSettings/index.test.tsx b/app/components/Views/Settings/AutoDetectTokensSettings/index.test.tsx
deleted file mode 100644
index c463bb86e38..00000000000
--- a/app/components/Views/Settings/AutoDetectTokensSettings/index.test.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-// Third party dependencies
-import React from 'react';
-import { fireEvent } from '@testing-library/react-native';
-
-// External dependencies
-import Engine from '../../../../core/Engine';
-import renderWithProvider from '../../../../util/test/renderWithProvider';
-import { backgroundState } from '../../../../util/test/initial-root-state';
-
-// Internal dependencies
-import AssetSettings from '.';
-import { TOKEN_DETECTION_TOGGLE } from './index.constants';
-
-let mockSetUseTokenDetection: jest.Mock;
-
-beforeEach(() => {
- mockSetUseTokenDetection.mockClear();
-});
-
-const mockEngine = Engine;
-
-jest.mock('../../../../core/Engine', () => {
- mockSetUseTokenDetection = jest.fn();
- return {
- init: () => mockEngine.init({}),
- context: {
- PreferencesController: {
- setUseTokenDetection: mockSetUseTokenDetection,
- },
- },
- };
-});
-
-describe('AssetSettings', () => {
- beforeEach(() => {
- jest.clearAllMocks();
- });
-
- const initialState = {
- engine: {
- backgroundState: {
- ...backgroundState,
- PreferencesController: {
- ...backgroundState.PreferencesController,
- useTokenDetection: true,
- },
- },
- },
- };
-
- it('should render correctly', () => {
- const tree = renderWithProvider(, {
- state: initialState,
- });
- expect(tree).toMatchSnapshot();
- });
-
- describe('Token Detection', () => {
- it('should toggle token detection when switch is pressed', () => {
- const { getByTestId } = renderWithProvider(, {
- state: initialState,
- });
- const toggleSwitch = getByTestId(TOKEN_DETECTION_TOGGLE);
- fireEvent(toggleSwitch, 'onValueChange', false);
- expect(mockSetUseTokenDetection).toHaveBeenCalledWith(false);
- });
- });
-});
diff --git a/app/components/Views/Settings/AutoDetectTokensSettings/index.tsx b/app/components/Views/Settings/AutoDetectTokensSettings/index.tsx
deleted file mode 100644
index d6ba8bb075e..00000000000
--- a/app/components/Views/Settings/AutoDetectTokensSettings/index.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-// Third party dependencies
-import React, { useCallback } from 'react';
-import { View, Switch } from 'react-native';
-import { useSelector } from 'react-redux';
-
-// External dependencies
-import { useStyles } from '../../../../component-library/hooks';
-import Engine from '../../../../core/Engine';
-import { selectUseTokenDetection } from '../../../../selectors/preferencesController';
-import { useTheme } from '../../../../util/theme';
-import { strings } from '../../../../../locales/i18n';
-import Text, {
- TextVariant,
- TextColor,
-} from '../../../../component-library/components/Texts/Text';
-
-// Internal dependencies
-import styleSheet from './index.styles';
-import { TOKEN_DETECTION_TOGGLE } from './index.constants';
-
-const AutoDetectTokensSettings = () => {
- const theme = useTheme();
- const { colors } = theme;
- const { styles } = useStyles(styleSheet, {});
-
- const isTokenDetectionEnabled = useSelector(selectUseTokenDetection);
-
- const toggleTokenDetection = useCallback((value: boolean) => {
- Engine.context.PreferencesController.setUseTokenDetection(value);
- }, []);
-
- return (
-
-
-
- {strings('app_settings.token_detection_title')}
-
-
-
-
-
-
- {strings('app_settings.token_detection_description')}
-
-
- );
-};
-
-export default AutoDetectTokensSettings;
diff --git a/app/components/Views/Settings/NotificationsSettings/index.test.tsx b/app/components/Views/Settings/NotificationsSettings/index.test.tsx
index ff8b0928e70..292c0906062 100644
--- a/app/components/Views/Settings/NotificationsSettings/index.test.tsx
+++ b/app/components/Views/Settings/NotificationsSettings/index.test.tsx
@@ -1,16 +1,11 @@
-import React, { useCallback } from 'react';
-import { renderHook, act } from '@testing-library/react-hooks';
+import React from 'react';
import renderWithProvider from '../../../../util/test/renderWithProvider';
-import NotificationsService from '../../../../util/notifications/services/NotificationService';
+
import { backgroundState } from '../../../../util/test/initial-root-state';
import NotificationsSettings from '.';
-
-import Routes from '../../../../constants/navigation/Routes';
import { Props } from './NotificationsSettings.types';
import { MOCK_ACCOUNTS_CONTROLLER_STATE } from '../../../../util/test/accountsControllerTestUtils';
-import { MetaMetricsEvents } from '../../../../core/Analytics/MetaMetrics.events';
-import { NavigationProp, ParamListBase } from '@react-navigation/native';
// Mock store.getState
let mockGetState: jest.Mock;
@@ -43,142 +38,8 @@ const mockInitialState = {
},
};
-jest.mock('@react-navigation/native', () => {
- const actualNav = jest.requireActual('@react-navigation/native');
- return {
- ...actualNav,
- useNavigation: () => ({
- navigate: jest.fn(),
- }),
- };
-});
-
-jest.mock('../../../../util/notifications/services/NotificationService', () => ({
- getAllPermissions: jest.fn(),
-}));
-
-jest.mock('../../../../core/Analytics/MetaMetrics.events', () => ({
- MetaMetricsEvents: {
- NOTIFICATIONS_SETTINGS_UPDATED: 'NOTIFICATIONS_SETTINGS_UPDATED',
- },
-}));
-
-const mockDisableNotifications = jest.fn();
-const mockEnableNotifications = jest.fn();
-const mockSetUiNotificationStatus = jest.fn();
-const mockTrackEvent = jest.fn();
-
-const mockNavigation = {
- navigate: jest.fn(),
-} as unknown as NavigationProp;
-
const setOptions = jest.fn();
-describe('toggleNotificationsEnabled', () => {
- beforeEach(() => {
- jest.clearAllMocks();
- });
-
- const setup = (basicFunctionalityEnabled: boolean, isMetamaskNotificationsEnabled: boolean, isProfileSyncingEnabled: boolean) => renderHook(() =>
- useCallback(async () => {
- if (!basicFunctionalityEnabled) {
- mockNavigation.navigate(Routes.MODAL.ROOT_MODAL_FLOW, {
- screen: Routes.SHEET.BASIC_FUNCTIONALITY,
- params: {
- caller: Routes.SETTINGS.NOTIFICATIONS,
- },
- });
- } else if (isMetamaskNotificationsEnabled) {
- mockDisableNotifications();
- mockSetUiNotificationStatus(false);
- } else {
- const { permission } = await NotificationsService.getAllPermissions(false);
- if (permission !== 'authorized') {
- return;
- }
-
- mockEnableNotifications();
- mockSetUiNotificationStatus(true);
- }
- mockTrackEvent(MetaMetricsEvents.NOTIFICATIONS_SETTINGS_UPDATED, {
- settings_type: 'notifications',
- old_value: isMetamaskNotificationsEnabled,
- new_value: !isMetamaskNotificationsEnabled,
- was_profile_syncing_on: isMetamaskNotificationsEnabled ? true : isProfileSyncingEnabled,
- });
- }, [])
- );
-
- it('should navigate to basic functionality screen if basicFunctionalityEnabled is false', async () => {
- const { result } = setup(false, false, false);
-
- await act(async () => {
- await result.current();
- });
-
- expect(mockNavigation.navigate).toHaveBeenCalledWith(Routes.MODAL.ROOT_MODAL_FLOW, {
- screen: Routes.SHEET.BASIC_FUNCTIONALITY,
- params: {
- caller: Routes.SETTINGS.NOTIFICATIONS,
- },
- });
- });
-
- it('should disable notifications if isMetamaskNotificationsEnabled is true', async () => {
- const { result } = setup(true, true, false);
-
- await act(async () => {
- await result.current();
- });
-
- expect(mockDisableNotifications).toHaveBeenCalled();
- expect(mockSetUiNotificationStatus).toHaveBeenCalledWith(false);
- });
-
- it('should enable notifications if isMetamaskNotificationsEnabled is false and permission is authorized', async () => {
- (NotificationsService.getAllPermissions as jest.Mock).mockResolvedValue({ permission: 'authorized' });
-
- const { result } = setup(true, false, false);
-
- await act(async () => {
- await result.current();
- });
-
- expect(mockEnableNotifications).toHaveBeenCalled();
- expect(mockSetUiNotificationStatus).toHaveBeenCalledWith(true);
- });
-
- it('should not enable notifications if permission is not authorized', async () => {
- (NotificationsService.getAllPermissions as jest.Mock).mockResolvedValue({ permission: 'denied' });
-
- const { result } = setup(true, false, false);
-
- await act(async () => {
- await result.current();
- });
-
- expect(mockEnableNotifications).not.toHaveBeenCalled();
- expect(mockSetUiNotificationStatus).not.toHaveBeenCalled();
- });
-
- it('should track event when notifications settings are updated', async () => {
- (NotificationsService.getAllPermissions as jest.Mock).mockResolvedValue({ permission: 'authorized' });
-
- const { result } = setup(true, false, true);
-
- await act(async () => {
- await result.current();
- });
-
- expect(mockTrackEvent).toHaveBeenCalledWith(MetaMetricsEvents.NOTIFICATIONS_SETTINGS_UPDATED, {
- settings_type: 'notifications',
- old_value: false,
- new_value: true,
- was_profile_syncing_on: true,
- });
- });
-});
-
describe('NotificationsSettings', () => {
it('should render correctly', () => {
mockGetState.mockImplementation(() => ({
@@ -199,21 +60,4 @@ describe('NotificationsSettings', () => {
);
expect(toJSON()).toMatchSnapshot();
});
-
- it('should toggle notifications and handle permission correctly', async () => {
- const isMetamaskNotificationsEnabled = true;
- const basicFunctionalityEnabled = true;
- const isProfileSyncingEnabled = true;
-
- const toggleNotificationsEnabledImpl = jest.fn(() => Promise.resolve({
- isMetamaskNotificationsEnabled,
- basicFunctionalityEnabled,
- isProfileSyncingEnabled,
- }));
-
- await toggleNotificationsEnabledImpl();
-
- expect(NotificationsService.getAllPermissions).toHaveBeenCalledTimes(1);
- expect(NotificationsService.getAllPermissions).toHaveBeenCalledWith(false);
- });
});
diff --git a/app/components/Views/Settings/NotificationsSettings/index.tsx b/app/components/Views/Settings/NotificationsSettings/index.tsx
index 707d2a24b7e..9dd493d57e6 100644
--- a/app/components/Views/Settings/NotificationsSettings/index.tsx
+++ b/app/components/Views/Settings/NotificationsSettings/index.tsx
@@ -31,7 +31,10 @@ import {
selectIsProfileSyncingEnabled,
} from '../../../../selectors/notifications';
-import NotificationsService from '../../../../util/notifications/services/NotificationService';
+import {
+ requestPushNotificationsPermission,
+ asyncAlert,
+} from '../../../../util/notifications';
import Routes from '../../../../constants/navigation/Routes';
import ButtonIcon, {
@@ -51,6 +54,7 @@ import AppConstants from '../../../../core/AppConstants';
import notificationsRows from './notificationsRows';
import { IconName } from '../../../../component-library/components/Icons/Icon';
import { MetaMetricsEvents } from '../../../../core/Analytics/MetaMetrics.events';
+import { AuthorizationStatus } from '@notifee/react-native';
interface MainNotificationSettingsProps extends Props {
toggleNotificationsEnabled: () => void;
@@ -183,17 +187,18 @@ const NotificationsSettings = ({ navigation, route }: Props) => {
disableNotifications();
setUiNotificationStatus(false);
} else {
- const { permission } = await NotificationsService.getAllPermissions(false);
- if (permission !== 'authorized') {
- return;
- }
+ const nativeNotificationStatus = await requestPushNotificationsPermission(
+ asyncAlert,
+ );
+ if (nativeNotificationStatus?.authorizationStatus === AuthorizationStatus.AUTHORIZED) {
/**
* Although this is an async function, we are dispatching an action (firing & forget)
* to emulate optimistic UI.
*/
enableNotifications();
setUiNotificationStatus(true);
+ }
}
trackEvent(MetaMetricsEvents.NOTIFICATIONS_SETTINGS_UPDATED, {
settings_type: 'notifications',
diff --git a/app/components/Views/Settings/PermissionsSettings/PermissionsManager.tsx b/app/components/Views/Settings/PermissionsSettings/PermissionsManager.tsx
index 0e5f26cb4ff..1d835b161ac 100644
--- a/app/components/Views/Settings/PermissionsSettings/PermissionsManager.tsx
+++ b/app/components/Views/Settings/PermissionsSettings/PermissionsManager.tsx
@@ -14,7 +14,7 @@ import Icon, {
import Text, {
TextVariant,
} from '../../../../component-library/components/Texts/Text';
-import { isMultichainVersion1Enabled } from '../../../../util/networks';
+import { isMutichainVersion1Enabled } from '../../../../util/networks';
import { getNavigationOptionsTitle } from '../../../UI/Navbar';
import PermissionItem from './PermissionItem';
import mockPermissionItems from './PermissionItem/PermissionItem.constants';
@@ -82,7 +82,7 @@ const PermissionsManager = (props: SDKSessionsManagerProps) => {
{
/* TODO: replace mock data with real data once available */
- isMultichainVersion1Enabled &&
+ isMutichainVersion1Enabled &&
mockPermissionItems.map((mockPermissionItem, _index) => (
{
style={styles.perissionsWrapper}
testID={SDKSelectorsIDs.SESSION_MANAGER_CONTAINER}
>
- {isMultichainVersion1Enabled && mockPermissionItems.length
+ {isMutichainVersion1Enabled && mockPermissionItems.length
? renderPermissions()
: renderEmptyResult()}
diff --git a/app/components/Views/Settings/SecuritySettings/SecuritySettings.tsx b/app/components/Views/Settings/SecuritySettings/SecuritySettings.tsx
index 5dda58ef252..f7ae9d6eff5 100644
--- a/app/components/Views/Settings/SecuritySettings/SecuritySettings.tsx
+++ b/app/components/Views/Settings/SecuritySettings/SecuritySettings.tsx
@@ -58,6 +58,7 @@ import {
selectIsIpfsGatewayEnabled,
selectIsMultiAccountBalancesEnabled,
selectDisplayNftMedia,
+ selectUseNftDetection,
selectShowIncomingTransactionNetworks,
selectShowTestNetworks,
selectUseSafeChainsListValidation,
@@ -88,6 +89,7 @@ import {
HASH_STRING,
HASH_TO_TEST,
IPFS_GATEWAY_SECTION,
+ NFT_AUTO_DETECT_MODE_SECTION,
NFT_DISPLAY_MEDIA_MODE_SECTION,
PASSCODE_CHOICE_STRING,
SDK_SECTION,
@@ -119,6 +121,7 @@ import ProfileSyncingComponent from '../../../UI/ProfileSyncing/ProfileSyncing';
import Routes from '../../../../constants/navigation/Routes';
import { MetaMetrics } from '../../../../core/Analytics';
import MetaMetricsAndDataCollectionSection from './Sections/MetaMetricsAndDataCollectionSection/MetaMetricsAndDataCollectionSection';
+import { UserProfileProperty } from '../../../../util/metrics/UserSettingsAnalyticsMetaData/UserProfileAnalyticsMetaData.types';
import {
selectIsMetamaskNotificationsEnabled,
selectIsProfileSyncingEnabled,
@@ -129,8 +132,6 @@ import { RootState } from '../../../../reducers';
import { EtherscanSupportedHexChainId } from '@metamask/preferences-controller';
import { useDisableNotifications } from '../../../../util/notifications/hooks/useNotifications';
import { isNotificationsFeatureEnabled } from '../../../../util/notifications';
-import AutoDetectNFTSettings from '../../Settings/AutoDetectNFTSettings';
-
const Heading: React.FC = ({ children, first }) => {
const { colors } = useTheme();
const styles = createStyles(colors);
@@ -144,7 +145,7 @@ const Heading: React.FC = ({ children, first }) => {
};
const Settings: React.FC = () => {
- const { trackEvent, isEnabled } = useMetrics();
+ const { trackEvent, isEnabled, addTraitsToUser } = useMetrics();
const theme = useTheme();
const { colors } = theme;
const styles = createStyles(colors);
@@ -197,6 +198,8 @@ const Settings: React.FC = () => {
selectUseTransactionSimulations,
);
+ const useNftDetection = useSelector(selectUseNftDetection);
+
const isNotificationEnabled = useSelector(
selectIsMetamaskNotificationsEnabled,
);
@@ -583,6 +586,27 @@ const Settings: React.FC = () => {
if (!value) PreferencesController?.setUseNftDetection(value);
};
+ const toggleNftAutodetect = useCallback(
+ (value) => {
+ const { PreferencesController } = Engine.context;
+ if (value) {
+ PreferencesController.setDisplayNftMedia(value);
+ }
+ PreferencesController.setUseNftDetection(value);
+ const traits = {
+ [UserProfileProperty.NFT_AUTODETECTION]: value
+ ? UserProfileProperty.ON
+ : UserProfileProperty.OFF,
+ };
+ addTraitsToUser(traits);
+ trackEvent(MetaMetricsEvents.NFT_AUTO_DETECTION_ENABLED, {
+ ...traits,
+ location: 'app_settings',
+ });
+ },
+ [addTraitsToUser, trackEvent],
+ );
+
const renderDisplayNftMedia = useCallback(
() => (
@@ -708,6 +732,43 @@ const Settings: React.FC = () => {
[colors, styles, useTransactionSimulations, theme.brandColors.white],
);
+ const renderAutoDetectNft = useCallback(
+ () => (
+
+
+
+ {strings('app_settings.nft_autodetect_mode')}
+
+
+
+
+
+
+ {strings('app_settings.autodetect_nft_desc')}
+
+
+ ),
+ [colors, styles, useNftDetection, theme, toggleNftAutodetect],
+ );
+
const setIpfsGateway = (gateway: string) => {
const { PreferencesController } = Engine.context;
PreferencesController.setIpfsGateway(gateway);
@@ -1093,11 +1154,7 @@ const Settings: React.FC = () => {
{strings('app_settings.token_nft_ens_subheading')}
{renderDisplayNftMedia()}
- {isMainnet && (
-
-
-
- )}
+ {isMainnet && renderAutoDetectNft()}
{renderIpfsGateway()}
-
+
-
-
+
- Autodetect NFTs
-
-
+
-
-
-
-
- Let MetaMask add NFTs you own using third-party services (like OpenSea). Autodetecting NFTs exposes your IP and account address to these services. Enabling this feature could associate your IP address with your Ethereum address and display fake NFTs airdropped by scammers. You can add tokens manually to avoid this risk.
-
+ thumbTintColor="#ffffff"
+ tintColor="#bbc0c566"
+ value={true}
+ />
+
+
+ Let MetaMask add NFTs you own using third-party services (like OpenSea). Autodetecting NFTs exposes your IP and account address to these services. Enabling this feature could associate your IP address with your Ethereum address and display fake NFTs airdropped by scammers. You can add tokens manually to avoid this risk.
+
StyleSheet.create({
@@ -202,7 +202,7 @@ const Settings = () => {
testID={SettingsViewSelectorsIDs.NOTIFICATIONS}
/>
)}
- {isMultichainVersion1Enabled && (
+ {isMutichainVersion1Enabled && (
{
const snapGetBip44EntropyTitle = (protocol: string) =>
`Control your ${protocol} accounts and assets`;
const snapGetEntropyTitle = 'Derive arbitrary keys unique to this snap';
- const endowmentKeyringTitle =
- 'Allow requests for adding and controlling Ethereum accounts';
+ const endowmentKeyringTitle = 'endowment:keyring';
const endowmentWebassemblyTitle = 'Support for WebAssembly';
const endowmentEthereumProviderTitle = 'Access the Ethereum provider';
const endowmentUnknownTitle = 'Unknown permission';
@@ -43,7 +42,6 @@ describe('SnapPermissions', () => {
'See the origins of websites that suggest transactions';
const endowmentExtendRuntimeTitle = 'Extend runtime';
const snapDialogTitle = 'Display custom dialogs';
- const snapManageAccountsTitle = 'Add and control Ethereum accounts';
const mockCoinTypes = [
{ coinType: 0 }, // Bitcoin
@@ -401,13 +399,6 @@ describe('SnapPermissions', () => {
caveats: null,
date: mockDate2,
},
- snap_manageAccounts: {
- caveats: null,
- date: mockDate2,
- id: '_jJdNdRnD5pXD728ngmHY',
- invoker: 'npm:@metamask/snap-simple-keyring-snap',
- parentCapability: 'snap_manageAccounts',
- },
};
const { getAllByTestId } = render(
@@ -418,7 +409,7 @@ describe('SnapPermissions', () => {
const permissionCellTitles = getAllByTestId(SNAP_PERMISSIONS_TITLE);
const permissionCellDates = getAllByTestId(SNAP_PERMISSIONS_DATE);
- expect(permissionCells.length).toBe(22);
+ expect(permissionCells.length).toBe(21);
expect(permissionCellTitles[0].props.children).toBe(longRunningTitle);
expect(permissionCellDates[0].props.children).toBe(
'Approved on May 24 at 5:35 pm',
@@ -519,10 +510,6 @@ describe('SnapPermissions', () => {
expect(permissionCellDates[20].props.children).toBe(
'Approved on Jun 6 at 4:02 pm',
);
- expect(permissionCellTitles[21].props.children).toBe(snapManageAccountsTitle);
- expect(permissionCellDates[21].props.children).toBe(
- 'Approved on Jun 6 at 4:02 pm',
- );
});
it('renders correct installed date', () => {
diff --git a/app/components/Views/Wallet/__snapshots__/index.test.tsx.snap b/app/components/Views/Wallet/__snapshots__/index.test.tsx.snap
index 3ec9cf2c174..31493f40c76 100644
--- a/app/components/Views/Wallet/__snapshots__/index.test.tsx.snap
+++ b/app/components/Views/Wallet/__snapshots__/index.test.tsx.snap
@@ -769,11 +769,11 @@ exports[`Wallet should render correctly 1`] = `
style={
{
"color": "#141618",
- "fontFamily": "EuclidCircularB-Medium",
- "fontSize": 14,
- "fontWeight": "500",
+ "fontFamily": "EuclidCircularB-Regular",
+ "fontSize": 16,
+ "fontWeight": "400",
"letterSpacing": 0,
- "lineHeight": 22,
+ "lineHeight": 24,
}
}
testID="account-label"
@@ -783,7 +783,7 @@ exports[`Wallet should render correctly 1`] = `
@@ -873,9 +871,9 @@ exports[`Wallet should render correctly 1`] = `
style={
{
"color": "#0376c9",
- "fontFamily": "EuclidCircularB-Medium",
+ "fontFamily": "EuclidCircularB-Regular",
"fontSize": 12,
- "fontWeight": "500",
+ "fontWeight": "400",
"letterSpacing": 0,
"lineHeight": 20,
}
diff --git a/app/components/Views/Wallet/index.tsx b/app/components/Views/Wallet/index.tsx
index 886a36d645a..e127c3ca2d3 100644
--- a/app/components/Views/Wallet/index.tsx
+++ b/app/components/Views/Wallet/index.tsx
@@ -35,7 +35,9 @@ import {
ToastContext,
ToastVariants,
} from '../../../component-library/components/Toast';
-import NotificationsService from '../../../util/notifications/services/NotificationService';
+import {
+ isDeviceNotificationEnabled,
+} from '../../../util/notifications';
import Engine from '../../../core/Engine';
import CollectibleContracts from '../../UI/CollectibleContracts';
import { MetaMetricsEvents } from '../../../core/Analytics';
@@ -341,7 +343,7 @@ const Wallet = ({
}
async function checkIfNotificationsAreEnabled() {
- await NotificationsService.isDeviceNotificationEnabled();
+ await isDeviceNotificationEnabled();
}
checkIfNotificationsAreEnabled();
});
diff --git a/app/components/Views/confirmations/Confirm/Confirm.test.tsx b/app/components/Views/confirmations/Confirm/Confirm.test.tsx
deleted file mode 100644
index af02b70c2fa..00000000000
--- a/app/components/Views/confirmations/Confirm/Confirm.test.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react';
-
-import renderWithProvider from '../../../../util/test/renderWithProvider';
-import { personalSignatureConfirmationState } from '../../../../util/test/confirm-data-helpers';
-import Confirm from './index';
-
-describe('Confirm', () => {
- it('should match snapshot for personal sign', async () => {
- const container = renderWithProvider(, {
- state: personalSignatureConfirmationState,
- });
- expect(container).toMatchSnapshot();
- });
-});
diff --git a/app/components/Views/confirmations/Confirm/Confirm.tsx b/app/components/Views/confirmations/Confirm/Confirm.tsx
deleted file mode 100644
index bf2c015f929..00000000000
--- a/app/components/Views/confirmations/Confirm/Confirm.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import React from 'react';
-import { View } from 'react-native';
-
-import BottomModal from '../../../../components/UI/BottomModal';
-import { useTheme } from '../../../../util/theme';
-import Footer from '../components/Confirm/Footer';
-import Title from '../components/Confirm/Title';
-import useConfirmationRedesignEnabled from '../hooks/useConfirmationRedesignEnabled';
-import createStyles from './style';
-
-const Confirm = () => {
- const { colors } = useTheme();
- const { isRedesignedEnabled } = useConfirmationRedesignEnabled();
-
- if (!isRedesignedEnabled) {
- return null;
- }
-
- const styles = createStyles(colors);
-
- return (
-
-
-
-
-
-
- );
-};
-
-export default Confirm;
diff --git a/app/components/Views/confirmations/Confirm/__snapshots__/Confirm.test.tsx.snap b/app/components/Views/confirmations/Confirm/__snapshots__/Confirm.test.tsx.snap
deleted file mode 100644
index 9a19ed18971..00000000000
--- a/app/components/Views/confirmations/Confirm/__snapshots__/Confirm.test.tsx.snap
+++ /dev/null
@@ -1,279 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Confirm should match snapshot for personal sign 1`] = `
-
-
-
-
-
-
- Signature request
-
-
-
-
-
- Reject
-
-
-
-
-
- Confirm
-
-
-
-
-
-
-`;
diff --git a/app/components/Views/confirmations/Confirm/index.tsx b/app/components/Views/confirmations/Confirm/index.tsx
deleted file mode 100644
index a4cf806e5d8..00000000000
--- a/app/components/Views/confirmations/Confirm/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './Confirm';
diff --git a/app/components/Views/confirmations/Confirm/style.tsx b/app/components/Views/confirmations/Confirm/style.tsx
deleted file mode 100644
index b1ac082a128..00000000000
--- a/app/components/Views/confirmations/Confirm/style.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { StyleSheet } from 'react-native';
-
-import Device from '../../../../util/device';
-import { Colors } from '../../../../util/theme/models';
-
-const createStyles = (colors: Colors) =>
- StyleSheet.create({
- container: {
- backgroundColor: colors.background.alternative,
- paddingTop: 24,
- minHeight: '90%',
- borderTopLeftRadius: 20,
- borderTopRightRadius: 20,
- paddingBottom: Device.isIphoneX() ? 20 : 0,
- alignItems: 'center',
- },
- });
-
-export default createStyles;
diff --git a/app/components/Views/confirmations/components/ApproveTransactionReview/AddNickname/types.ts b/app/components/Views/confirmations/components/ApproveTransactionReview/AddNickname/types.ts
index bf83928a2bd..4e7da1e8f0b 100644
--- a/app/components/Views/confirmations/components/ApproveTransactionReview/AddNickname/types.ts
+++ b/app/components/Views/confirmations/components/ApproveTransactionReview/AddNickname/types.ts
@@ -1,4 +1,4 @@
-import { AddressBookControllerState } from '@metamask/address-book-controller';
+import { AddressBookState } from '@metamask/address-book-controller';
import { NetworkType } from '@metamask/controller-utils';
import { InternalAccount } from '@metamask/keyring-api';
import type { NetworkState } from '@metamask/network-controller';
@@ -17,6 +17,6 @@ export interface AddNicknameProps {
providerChainId: Hex;
providerNetwork: string;
providerRpcTarget: string;
- addressBook: AddressBookControllerState['addressBook'];
+ addressBook: AddressBookState['addressBook'];
internalAccounts: InternalAccount[];
}
diff --git a/app/components/Views/confirmations/components/Confirm/Footer/Footer.test.tsx b/app/components/Views/confirmations/components/Confirm/Footer/Footer.test.tsx
deleted file mode 100644
index 4139a44c779..00000000000
--- a/app/components/Views/confirmations/components/Confirm/Footer/Footer.test.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import React from 'react';
-
-import renderWithProvider from '../../../../../../util/test/renderWithProvider';
-import { personalSignatureConfirmationState } from '../../../../../../util/test/confirm-data-helpers';
-import Footer from './index';
-import { fireEvent } from '@testing-library/react-native';
-
-const mockConfirmSpy = jest.fn();
-const mockRejectSpy = jest.fn();
-jest.mock('../../../hooks/useApprovalRequest', () => () => ({
- onConfirm: mockConfirmSpy,
- onReject: mockRejectSpy,
-}));
-
-describe('Footer', () => {
- it('should match snapshot for personal sign', async () => {
- const container = renderWithProvider(, {
- state: personalSignatureConfirmationState,
- });
- expect(container).toMatchSnapshot();
- });
-
- it('should call onConfirm when confirm button is clicked', async () => {
- const { getByText } = renderWithProvider(, {
- state: personalSignatureConfirmationState,
- });
- fireEvent.press(getByText('Confirm'));
- expect(mockConfirmSpy).toHaveBeenCalledTimes(1);
- });
-
- it('should call onReject when reject button is clicked', async () => {
- const { getByText } = renderWithProvider(, {
- state: personalSignatureConfirmationState,
- });
- fireEvent.press(getByText('Reject'));
- expect(mockRejectSpy).toHaveBeenCalledTimes(1);
- });
-});
diff --git a/app/components/Views/confirmations/components/Confirm/Footer/Footer.tsx b/app/components/Views/confirmations/components/Confirm/Footer/Footer.tsx
deleted file mode 100644
index 6f776b669e0..00000000000
--- a/app/components/Views/confirmations/components/Confirm/Footer/Footer.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import React from 'react';
-import { View } from 'react-native';
-
-import { strings } from '../../../../../../../locales/i18n';
-import StyledButton from '../../../../../../components/UI/StyledButton';
-import { useTheme } from '../../../../../../util/theme';
-import useApprovalRequest from '../../../hooks/useApprovalRequest';
-import createStyles from './style';
-
-const Footer = () => {
- const { onConfirm, onReject } = useApprovalRequest();
- const { colors } = useTheme();
-
- const styles = createStyles(colors);
-
- return (
-
-
- {strings('confirm.reject')}
-
-
-
- {strings('confirm.confirm')}
-
-
- );
-};
-
-export default Footer;
diff --git a/app/components/Views/confirmations/components/Confirm/Footer/__snapshots__/Footer.test.tsx.snap b/app/components/Views/confirmations/components/Confirm/Footer/__snapshots__/Footer.test.tsx.snap
deleted file mode 100644
index a289fd77735..00000000000
--- a/app/components/Views/confirmations/components/Confirm/Footer/__snapshots__/Footer.test.tsx.snap
+++ /dev/null
@@ -1,130 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Footer should match snapshot for personal sign 1`] = `
-
-
-
- Reject
-
-
-
-
-
- Confirm
-
-
-
-`;
diff --git a/app/components/Views/confirmations/components/Confirm/Footer/index.ts b/app/components/Views/confirmations/components/Confirm/Footer/index.ts
deleted file mode 100644
index be92134c1ba..00000000000
--- a/app/components/Views/confirmations/components/Confirm/Footer/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './Footer';
diff --git a/app/components/Views/confirmations/components/Confirm/Footer/style.ts b/app/components/Views/confirmations/components/Confirm/Footer/style.ts
deleted file mode 100644
index 3054785ba21..00000000000
--- a/app/components/Views/confirmations/components/Confirm/Footer/style.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { StyleSheet } from 'react-native';
-
-import { Colors } from '../../../../../../util/theme/models';
-
-const createStyles = (colors: Colors) =>
- StyleSheet.create({
- confirmButton: {
- flex: 1,
- },
- rejectButton: {
- flex: 1,
- backgroundColor: colors.background.alternative,
- },
- divider: {
- height: 1,
- backgroundColor: colors.border.muted,
- },
- buttonsContainer: {
- flexDirection: 'row',
- padding: 16,
- },
- buttonDivider: {
- width: 8,
- },
- });
-
-export default createStyles;
diff --git a/app/components/Views/confirmations/components/Confirm/Title/Title.test.tsx b/app/components/Views/confirmations/components/Confirm/Title/Title.test.tsx
deleted file mode 100644
index 4c20a4ed814..00000000000
--- a/app/components/Views/confirmations/components/Confirm/Title/Title.test.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react';
-
-import renderWithProvider from '../../../../../../util/test/renderWithProvider';
-import { personalSignatureConfirmationState } from '../../../../../../util/test/confirm-data-helpers';
-import Title from './index';
-
-describe('Title', () => {
- it('should match snapshot for personal sign', async () => {
- const container = renderWithProvider(, {
- state: personalSignatureConfirmationState,
- });
- expect(container).toMatchSnapshot();
- });
-});
diff --git a/app/components/Views/confirmations/components/Confirm/Title/Title.tsx b/app/components/Views/confirmations/components/Confirm/Title/Title.tsx
deleted file mode 100644
index c674171f14b..00000000000
--- a/app/components/Views/confirmations/components/Confirm/Title/Title.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import React, { useMemo } from 'react';
-import { Text, View } from 'react-native';
-import { TransactionType } from '@metamask/transaction-controller';
-
-import { strings } from '../../../../../../../locales/i18n';
-import { useTheme } from '../../../../../../util/theme';
-import useApprovalRequest from '../../../hooks/useApprovalRequest';
-import createStyles from './style';
-
-const getTitle = (confirmationType?: string) => {
- switch (confirmationType) {
- case TransactionType.personalSign:
- return strings('confirm.title.signature');
- default:
- return '';
- }
-};
-
-const Title = () => {
- const { approvalRequest } = useApprovalRequest();
- const { colors } = useTheme();
-
- const styles = createStyles(colors);
- const title = useMemo(
- () => getTitle(approvalRequest?.type),
- [approvalRequest?.type],
- );
-
- return (
-
- {title}
-
- );
-};
-
-export default Title;
diff --git a/app/components/Views/confirmations/components/Confirm/Title/__snapshots__/Title.test.tsx.snap b/app/components/Views/confirmations/components/Confirm/Title/__snapshots__/Title.test.tsx.snap
deleted file mode 100644
index d68aff5d51e..00000000000
--- a/app/components/Views/confirmations/components/Confirm/Title/__snapshots__/Title.test.tsx.snap
+++ /dev/null
@@ -1,24 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Title should match snapshot for personal sign 1`] = `
-
-
- Signature request
-
-
-`;
diff --git a/app/components/Views/confirmations/components/Confirm/Title/index.ts b/app/components/Views/confirmations/components/Confirm/Title/index.ts
deleted file mode 100644
index eaa93a3c584..00000000000
--- a/app/components/Views/confirmations/components/Confirm/Title/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './Title';
diff --git a/app/components/Views/confirmations/components/Confirm/Title/style.ts b/app/components/Views/confirmations/components/Confirm/Title/style.ts
deleted file mode 100644
index 22003c846a7..00000000000
--- a/app/components/Views/confirmations/components/Confirm/Title/style.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { StyleSheet } from 'react-native';
-
-import { Colors } from '../../../../../../util/theme/models';
-import { fontStyles } from '../../../../../../styles/common';
-
-const createStyles = (colors: Colors) =>
- StyleSheet.create({
- titleContainer: {
- marginBottom: 10,
- },
- title: {
- color: colors.text.default,
- ...fontStyles.bold,
- fontSize: 18,
- fontWeight: '700'
- }
- });
-
-export default createStyles;
diff --git a/app/components/Views/confirmations/components/SignatureRequest/Root/Root.tsx b/app/components/Views/confirmations/components/SignatureRequest/Root/Root.tsx
index 0dfb8e11683..793d5fb8253 100644
--- a/app/components/Views/confirmations/components/SignatureRequest/Root/Root.tsx
+++ b/app/components/Views/confirmations/components/SignatureRequest/Root/Root.tsx
@@ -5,7 +5,6 @@ import { useNavigation } from '@react-navigation/native';
import setSignatureRequestSecurityAlertResponse from '../../../../../../actions/signatureRequest';
import { store } from '../../../../../../store';
import { useTheme } from '../../../../../../util/theme';
-import useConfirmationRedesignEnabled from '../../../hooks/useConfirmationRedesignEnabled';
import PersonalSign from '../../PersonalSign';
import TypedSign from '../../TypedSign';
import { MessageParams } from '../types';
@@ -40,7 +39,6 @@ const Root = ({
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(reduxState: any) => reduxState.modals.signMessageModalVisible,
);
- const { isRedesignedEnabled } = useConfirmationRedesignEnabled();
const toggleExpandedMessage = () =>
setShowExpandedMessage(!showExpandedMessage);
@@ -54,13 +52,7 @@ const Root = ({
};
}, []);
- if (
- !messageParams ||
- !currentPageMeta ||
- !approvalType ||
- !visibility ||
- isRedesignedEnabled
- ) {
+ if (!messageParams || !currentPageMeta || !approvalType || !visibility) {
return null;
}
diff --git a/app/components/Views/confirmations/hooks/useConfirmationRedesignEnabled.ts b/app/components/Views/confirmations/hooks/useConfirmationRedesignEnabled.ts
deleted file mode 100644
index f9e6a531a31..00000000000
--- a/app/components/Views/confirmations/hooks/useConfirmationRedesignEnabled.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { useMemo } from 'react';
-
-import { ApprovalTypes } from '../../../../core/RPCMethods/RPCMethodMiddleware';
-import useApprovalRequest from './useApprovalRequest';
-
-const useConfirmationRedesignEnabled = () => {
- const { approvalRequest } = useApprovalRequest();
- const approvalRequestType = approvalRequest?.type;
-
- const isRedesignedEnabled = useMemo(
- () =>
- approvalRequestType &&
- process.env.REDESIGNED_SIGNATURE_REQUEST === 'true' &&
- approvalRequestType === ApprovalTypes.PERSONAL_SIGN,
- [approvalRequestType],
- );
-
- return { isRedesignedEnabled };
-};
-
-export default useConfirmationRedesignEnabled;
diff --git a/app/constants/navigation/Routes.ts b/app/constants/navigation/Routes.ts
index 46462a29797..773bbc7dc47 100644
--- a/app/constants/navigation/Routes.ts
+++ b/app/constants/navigation/Routes.ts
@@ -137,13 +137,9 @@ const Routes = {
OPT_IN_STACK: 'OptInStack',
DETAILS: 'NotificationsDetails',
},
- STAKING: {
+ STAKE: {
STAKE: 'Stake',
UNSTAKE: 'Unstake',
- CLAIM: 'Claim',
- MODALS: {
- LEARN_MORE: 'LearnMore',
- },
},
///: BEGIN:ONLY_INCLUDE_IF(external-snaps)
SNAPS: {
diff --git a/app/constants/time.ts b/app/constants/time.ts
deleted file mode 100644
index 8b594570b04..00000000000
--- a/app/constants/time.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * All times are in milliseconds.
- */
-export const SECOND = 1000;
-
-export const MINUTE = SECOND * 60;
-
-export const HOUR = MINUTE * 60;
-
-export const DAY = HOUR * 24;
diff --git a/app/core/Analytics/MetaMetrics.events.ts b/app/core/Analytics/MetaMetrics.events.ts
index 5b972ea1130..0a61dbc6f16 100644
--- a/app/core/Analytics/MetaMetrics.events.ts
+++ b/app/core/Analytics/MetaMetrics.events.ts
@@ -80,8 +80,6 @@ enum EVENT_NAME {
// Network
NETWORK_SWITCHED = 'Network Switched',
- NETWORK_SWITCH_REQUESTED_AND_MODAL_SHOWN = 'Network Switch Requested and Modal Shown',
- NETWORK_SWITCH_CONFIRM_PRESSED = 'Network Switch Confirm Pressed',
NETWORK_ADDED = 'Network Added',
NETWORK_REQUESTED = 'Network Requested',
NETWORK_REQUEST_REJECTED = 'Network Request Rejected',
@@ -484,12 +482,6 @@ const events = {
COLLECTIBLE_REMOVED: generateOpt(EVENT_NAME.COLLECTIBLE_REMOVED),
CURRENCY_CHANGED: generateOpt(EVENT_NAME.CURRENCY_CHANGED),
NETWORK_SWITCHED: generateOpt(EVENT_NAME.NETWORK_SWITCHED),
- NETWORK_SWITCH_REQUESTED_AND_MODAL_SHOWN: generateOpt(
- EVENT_NAME.NETWORK_SWITCH_REQUESTED_AND_MODAL_SHOWN,
- ),
- NETWORK_SWITCH_CONFIRM_PRESSED: generateOpt(
- EVENT_NAME.NETWORK_SWITCH_CONFIRM_PRESSED,
- ),
NETWORK_ADDED: generateOpt(EVENT_NAME.NETWORK_ADDED),
NETWORK_REQUESTED: generateOpt(EVENT_NAME.NETWORK_REQUESTED),
NETWORK_REQUEST_REJECTED: generateOpt(EVENT_NAME.NETWORK_REQUEST_REJECTED),
diff --git a/app/core/BackgroundBridge/BackgroundBridge.js b/app/core/BackgroundBridge/BackgroundBridge.js
index 0202794e01a..9b7b4f63554 100644
--- a/app/core/BackgroundBridge/BackgroundBridge.js
+++ b/app/core/BackgroundBridge/BackgroundBridge.js
@@ -451,7 +451,7 @@ export class BackgroundBridge extends EventEmitter {
snapMethodMiddlewareBuilder(
Engine.context,
Engine.controllerMessenger,
- this.url,
+ origin,
// We assume that origins connecting through the BackgroundBridge are websites
SubjectType.Website,
),
diff --git a/app/core/DeeplinkManager/ParseManager/parseDeeplink.ts b/app/core/DeeplinkManager/ParseManager/parseDeeplink.ts
index 7bca677e35e..4c799701503 100644
--- a/app/core/DeeplinkManager/ParseManager/parseDeeplink.ts
+++ b/app/core/DeeplinkManager/ParseManager/parseDeeplink.ts
@@ -10,7 +10,6 @@ import handleUniversalLink from './handleUniversalLink';
import connectWithWC from './connectWithWC';
import { Alert } from 'react-native';
import { strings } from '../../../../locales/i18n';
-import AppConstants from '../../../core/AppConstants';
function parseDeeplink({
deeplinkManager: instance,
@@ -99,14 +98,8 @@ function parseDeeplink({
error as Error,
'DeepLinkManager:parse error parsing deeplink',
);
- if (origin === AppConstants.DEEPLINKS.ORIGIN_QR_CODE) {
- Alert.alert(
- strings('qr_scanner.unrecognized_address_qr_code_title'),
- strings('qr_scanner.unrecognized_address_qr_code_desc'),
- );
- } else {
- Alert.alert(strings('deeplink.invalid'), `Invalid URL: ${url}`);
- }
+
+ Alert.alert(strings('deeplink.invalid'), `Invalid URL: ${url}`);
}
return false;
diff --git a/app/core/Engine.test.js b/app/core/Engine.test.js
index 3bbe199447f..7ba32d42bde 100644
--- a/app/core/Engine.test.js
+++ b/app/core/Engine.test.js
@@ -52,7 +52,39 @@ describe('Engine', () => {
const engine = Engine.init({});
const initialBackgroundState = engine.datamodel.state;
- expect(initialBackgroundState).toStrictEqual(backgroundState);
+ expect(initialBackgroundState).toStrictEqual({
+ ...backgroundState,
+
+ // JSON cannot store the value undefined, so we append it here
+ SmartTransactionsController: {
+ smartTransactionsState: {
+ fees: {
+ approvalTxFees: undefined,
+ tradeTxFees: undefined,
+ },
+ feesByChainId: {
+ '0x1': {
+ approvalTxFees: undefined,
+ tradeTxFees: undefined,
+ },
+ '0xaa36a7': {
+ approvalTxFees: undefined,
+ tradeTxFees: undefined,
+ },
+ },
+ liveness: true,
+ livenessByChainId: {
+ '0x1': true,
+ '0xaa36a7': true,
+ },
+ smartTransactions: {
+ '0x1': [],
+ },
+ userOptIn: undefined,
+ userOptInV2: undefined,
+ },
+ },
+ });
});
it('setSelectedAccount throws an error if no account exists for the given address', () => {
diff --git a/app/core/Engine.ts b/app/core/Engine.ts
index 0c9901b42a5..4218e4e19fa 100644
--- a/app/core/Engine.ts
+++ b/app/core/Engine.ts
@@ -1,6 +1,5 @@
/* eslint-disable @typescript-eslint/no-shadow */
import Crypto from 'react-native-quick-crypto';
-import { scrypt } from 'react-native-fast-crypto';
import {
AccountTrackerController,
AccountTrackerState,
@@ -35,9 +34,7 @@ import PREINSTALLED_SNAPS from '../lib/snaps/preinstalled-snaps';
///: END:ONLY_INCLUDE_IF
import {
AddressBookController,
- AddressBookControllerActions,
- AddressBookControllerEvents,
- AddressBookControllerState,
+ AddressBookState,
} from '@metamask/address-book-controller';
import { BaseState } from '@metamask/base-controller';
import { ComposableController } from '@metamask/composable-controller';
@@ -141,7 +138,6 @@ import {
LoggingController,
LoggingControllerState,
LoggingControllerActions,
- LoggingControllerEvents,
} from '@metamask/logging-controller';
import {
LedgerKeyring,
@@ -219,37 +215,19 @@ import {
networkIdUpdated,
networkIdWillUpdate,
} from '../core/redux/slices/inpageProvider';
-import SmartTransactionsController, {
- type SmartTransactionsControllerActions,
- type SmartTransactionsControllerEvents,
- type SmartTransactionsControllerState,
-} from '@metamask/smart-transactions-controller';
+import SmartTransactionsController from '@metamask/smart-transactions-controller';
import { getAllowedSmartTransactionsChainIds } from '../../app/constants/smartTransactions';
import { selectShouldUseSmartTransaction } from '../selectors/smartTransactionsController';
import { selectSwapsChainFeatureFlags } from '../reducers/swaps';
import { SmartTransactionStatuses } from '@metamask/smart-transactions-controller/dist/types';
import { submitSmartTransactionHook } from '../util/smart-transactions/smart-publish-hook';
+import { SmartTransactionsControllerState } from '@metamask/smart-transactions-controller/dist/SmartTransactionsController';
import { zeroAddress } from 'ethereumjs-util';
import { toChecksumHexAddress } from '@metamask/controller-utils';
import { ExtendedControllerMessenger } from './ExtendedControllerMessenger';
import EthQuery from '@metamask/eth-query';
import { TransactionControllerOptions } from '@metamask/transaction-controller/dist/types/TransactionController';
import DomainProxyMap from '../lib/DomainProxyMap/DomainProxyMap';
-import {
- MetaMetricsEventCategory,
- MetaMetricsEventName,
-} from '@metamask/smart-transactions-controller/dist/constants';
-import {
- getSmartTransactionMetricsProperties,
- getSmartTransactionMetricsSensitiveProperties,
-} from '@metamask/smart-transactions-controller/dist/utils';
-///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
-import { snapKeyringBuilder } from './SnapKeyring';
-import { removeAccountsFromPermissions } from './Permissions';
-import { keyringSnapPermissionsBuilder } from './SnapKeyring/keyringSnapsPermissions';
-import { HandleSnapRequestArgs } from './Snaps/types';
-import { handleSnapRequest } from './Snaps/utils';
-///: END:ONLY_INCLUDE_IF
const NON_EMPTY = 'NON_EMPTY';
@@ -280,7 +258,6 @@ type SnapsGlobalEvents =
///: END:ONLY_INCLUDE_IF
type GlobalActions =
- | AddressBookControllerActions
| ApprovalControllerActions
| GetCurrencyRateState
| GetGasFeeState
@@ -301,11 +278,9 @@ type GlobalActions =
| PreferencesControllerActions
| TokensControllerActions
| TokenListControllerActions
- | SelectedNetworkControllerActions
- | SmartTransactionsControllerActions;
+ | SelectedNetworkControllerActions;
type GlobalEvents =
- | AddressBookControllerEvents
| ApprovalControllerEvents
| CurrencyRateStateChange
| GasFeeStateChange
@@ -317,7 +292,6 @@ type GlobalEvents =
| SnapsGlobalEvents
///: END:ONLY_INCLUDE_IF
| SignatureControllerEvents
- | LoggingControllerEvents
| KeyringControllerEvents
| PPOMControllerEvents
| AccountsControllerEvents
@@ -325,15 +299,14 @@ type GlobalEvents =
| TokensControllerEvents
| TokenListControllerEvents
| TransactionControllerEvents
- | SelectedNetworkControllerEvents
- | SmartTransactionsControllerEvents;
+ | SelectedNetworkControllerEvents;
type PermissionsByRpcMethod = ReturnType;
type Permissions = PermissionsByRpcMethod[keyof PermissionsByRpcMethod];
export interface EngineState {
AccountTrackerController: AccountTrackerState;
- AddressBookController: AddressBookControllerState;
+ AddressBookController: AddressBookState;
AssetsContractController: BaseState;
NftController: NftState;
TokenListController: TokenListState;
@@ -419,20 +392,6 @@ type RequiredControllers = Omit;
*/
type OptionalControllers = Pick;
-/**
- * Combines required and optional controllers for the Engine context type.
- */
-export type EngineContext = RequiredControllers & Partial;
-
-/**
- * Type definition for the controller messenger used in the Engine.
- * It extends the base ControllerMessenger with global actions and events.
- */
-export type ControllerMessenger = ExtendedControllerMessenger<
- GlobalActions,
- GlobalEvents
->;
-
/**
* Core controller responsible for composing other metamask controllers together
* and exposing convenience methods for common wallet operations.
@@ -445,11 +404,11 @@ class Engine {
/**
* A collection of all controller instances
*/
- context: EngineContext;
+ context: RequiredControllers & Partial;
/**
* The global controller messenger.
*/
- controllerMessenger: ControllerMessenger;
+ controllerMessenger: ExtendedControllerMessenger;
/**
* ComposableController reference containing all child controllers
*/
@@ -470,16 +429,12 @@ class Engine {
* Object that runs and manages the execution of Snaps
*/
snapExecutionService: WebViewExecutionService;
- snapController: SnapController;
- subjectMetadataController: SubjectMetadataController;
///: END:ONLY_INCLUDE_IF
transactionController: TransactionController;
smartTransactionsController: SmartTransactionsController;
- keyringController: KeyringController;
-
/**
* Creates a CoreController instance
*/
@@ -624,6 +579,7 @@ class Engine {
);
const loggingController = new LoggingController({
+ // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
messenger: this.controllerMessenger.getRestricted<
'LoggingController',
never,
@@ -635,6 +591,7 @@ class Engine {
}),
state: initialState.LoggingController,
});
+ // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
const accountsControllerMessenger: AccountsControllerMessenger =
this.controllerMessenger.getRestricted({
name: 'AccountsController',
@@ -758,8 +715,6 @@ class Engine {
});
phishingController.maybeUpdateState();
- const additionalKeyrings = [];
-
const qrKeyringBuilder = () => {
const keyring = new QRHardwareKeyring();
// to fix the bug in #9560, forgetDevice will reset all keyring properties to default.
@@ -768,73 +723,16 @@ class Engine {
};
qrKeyringBuilder.type = QRHardwareKeyring.type;
- additionalKeyrings.push(qrKeyringBuilder);
-
const bridge = new LedgerMobileBridge(new LedgerTransportMiddleware());
const ledgerKeyringBuilder = () => new LedgerKeyring({ bridge });
ledgerKeyringBuilder.type = LedgerKeyring.type;
- additionalKeyrings.push(ledgerKeyringBuilder);
-
- ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
-
- /**
- * Removes an account from state / storage.
- *
- * @param {string} address - A hex address
- */
- const removeAccount = async (address: string) => {
- // Remove all associated permissions
- await removeAccountsFromPermissions([address]);
- // Remove account from the keyring
- await this.keyringController.removeAccount(address as Hex);
- return address;
- };
-
- const snapKeyringBuildMessenger = this.controllerMessenger.getRestricted({
- name: 'SnapKeyringBuilder',
- allowedActions: [
- 'ApprovalController:addRequest',
- 'ApprovalController:acceptRequest',
- 'ApprovalController:rejectRequest',
- 'ApprovalController:startFlow',
- 'ApprovalController:endFlow',
- 'ApprovalController:showSuccess',
- 'ApprovalController:showError',
- 'PhishingController:testOrigin',
- 'PhishingController:maybeUpdateState',
- 'KeyringController:getAccounts',
- 'AccountsController:setSelectedAccount',
- 'AccountsController:getAccountByAddress',
- 'AccountsController:setAccountName',
- ],
- allowedEvents: [],
- });
-
- const getSnapController = () => this.snapController;
-
- // Necessary to persist the keyrings and update the accounts both within the keyring controller and accounts controller
- const persistAndUpdateAccounts = async () => {
- await this.keyringController.persistAllKeyrings();
- await accountsController.updateAccounts();
- };
-
- additionalKeyrings.push(
- snapKeyringBuilder(
- snapKeyringBuildMessenger,
- getSnapController,
- persistAndUpdateAccounts,
- (address) => removeAccount(address),
- ),
- );
-
- ///: END:ONLY_INCLUDE_IF
-
- this.keyringController = new KeyringController({
+ const keyringController = new KeyringController({
removeIdentity: preferencesController.removeIdentity.bind(
preferencesController,
),
encryptor,
+ // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
messenger: this.controllerMessenger.getRestricted({
name: 'KeyringController',
allowedActions: [],
@@ -842,7 +740,7 @@ class Engine {
}),
state: initialKeyringState || initialState.KeyringController,
// @ts-expect-error To Do: Update the type of QRHardwareKeyring to Keyring
- keyringBuilders: additionalKeyrings,
+ keyringBuilders: [qrKeyringBuilder, ledgerKeyringBuilder],
});
///: BEGIN:ONLY_INCLUDE_IF(preinstalled-snaps,external-snaps)
@@ -852,7 +750,7 @@ class Engine {
const getPrimaryKeyringMnemonic = () => {
// TODO: Replace "any" with type
// eslint-disable-next-line @typescript-eslint/no-explicit-any
- const [keyring]: any = this.keyringController.getKeyringsByType(
+ const [keyring]: any = keyringController.getKeyringsByType(
KeyringTypes.hd,
);
if (!keyring.mnemonic) {
@@ -867,97 +765,83 @@ class Engine {
return state === 'active';
};
- const snapRestrictedMethods = {
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
- // @ts-ignore
- clearSnapState: this.controllerMessenger.call.bind(
- this.controllerMessenger,
- 'SnapController:clearSnapState',
- ),
- getMnemonic: getPrimaryKeyringMnemonic.bind(this),
- getUnlockPromise: getAppState.bind(this),
- getSnap: this.controllerMessenger.call.bind(
- this.controllerMessenger,
- 'SnapController:get',
- ),
- handleSnapRpcRequest: async (args: HandleSnapRequestArgs) =>
- await handleSnapRequest(this.controllerMessenger, args),
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
- // @ts-ignore
- getSnapState: this.controllerMessenger.call.bind(
- this.controllerMessenger,
- 'SnapController:getSnapState',
- ),
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
- // @ts-ignore
- updateSnapState: this.controllerMessenger.call.bind(
- this.controllerMessenger,
- 'SnapController:updateSnapState',
- ),
- maybeUpdatePhishingList: this.controllerMessenger.call.bind(
- this.controllerMessenger,
- 'PhishingController:maybeUpdateState',
- ),
- isOnPhishingList: (origin: string) =>
- this.controllerMessenger.call<'PhishingController:testOrigin'>(
- 'PhishingController:testOrigin',
- origin,
- ).result,
- showDialog: (
- origin: string,
- type: EnumToUnion,
- // TODO: Replace "any" with type
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- content: any, // should be Component from '@metamask/snaps-ui';
- // TODO: Replace "any" with type
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- placeholder?: any,
- ) =>
- approvalController.addAndShowApprovalRequest({
- origin,
- type,
- requestData: { content, placeholder },
- }),
- showInAppNotification: (origin: string, args: NotificationArgs) => {
- Logger.log(
- 'Snaps/ showInAppNotification called with args: ',
- args,
- ' and origin: ',
- origin,
- );
- },
- hasPermission: (origin: string, target: string) =>
- this.controllerMessenger.call<'PermissionController:hasPermission'>(
- 'PermissionController:hasPermission',
- origin,
- target,
- ),
- };
- ///: END:ONLY_INCLUDE_IF
-
- ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
- const keyringSnapMethods = {
- getAllowedKeyringMethods: (origin: string) =>
- keyringSnapPermissionsBuilder(origin),
- getSnapKeyring: this.getSnapKeyring.bind(this),
- };
- ///: END:ONLY_INCLUDE_IF
-
const getSnapPermissionSpecifications = () => ({
...buildSnapEndowmentSpecifications(Object.keys(ExcludedSnapEndowments)),
...buildSnapRestrictedMethodSpecifications(
Object.keys(ExcludedSnapPermissions),
{
- ///: BEGIN:ONLY_INCLUDE_IF(preinstalled-snaps,external-snaps)
- ...snapRestrictedMethods,
- ///: END:ONLY_INCLUDE_IF
- ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
- ...keyringSnapMethods,
- ///: END:ONLY_INCLUDE_IF
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-ignore
+ clearSnapState: this.controllerMessenger.call.bind(
+ this.controllerMessenger,
+ 'SnapController:clearSnapState',
+ ),
+ getMnemonic: getPrimaryKeyringMnemonic.bind(this),
+ getUnlockPromise: getAppState.bind(this),
+ getSnap: this.controllerMessenger.call.bind(
+ this.controllerMessenger,
+ 'SnapController:get',
+ ),
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-ignore
+ handleSnapRpcRequest: this.controllerMessenger.call.bind(
+ this.controllerMessenger,
+ 'SnapController:handleRequest',
+ ),
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-ignore
+ getSnapState: this.controllerMessenger.call.bind(
+ this.controllerMessenger,
+ 'SnapController:getSnapState',
+ ),
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-ignore
+ updateSnapState: this.controllerMessenger.call.bind(
+ this.controllerMessenger,
+ 'SnapController:updateSnapState',
+ ),
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-ignore
+ maybeUpdatePhishingList: this.controllerMessenger.call.bind(
+ this.controllerMessenger,
+ 'PhishingController:maybeUpdateState',
+ ),
+ isOnPhishingList: (origin: string) =>
+ this.controllerMessenger.call<'PhishingController:testOrigin'>(
+ 'PhishingController:testOrigin',
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-ignore
+ origin,
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-ignore
+ ).result,
+ showDialog: (
+ origin: string,
+ type: EnumToUnion,
+ // TODO: Replace "any" with type
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ content: any, // should be Component from '@metamask/snaps-ui';
+ // TODO: Replace "any" with type
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ placeholder?: any,
+ ) =>
+ approvalController.addAndShowApprovalRequest({
+ origin,
+ type,
+ requestData: { content, placeholder },
+ }),
+ showInAppNotification: (origin: string, args: NotificationArgs) => {
+ Logger.log(
+ 'Snaps/ showInAppNotification called with args: ',
+ args,
+ ' and origin: ',
+ origin,
+ );
+ },
},
),
});
-
+ ///: END:ONLY_INCLUDE_IF
const accountTrackerController = new AccountTrackerController({
onPreferencesStateChange,
getIdentities: () => preferencesController.state.identities,
@@ -999,7 +883,7 @@ class Engine {
// @ts-expect-error Typecast permissionType from getPermissionSpecifications to be of type PermissionType.RestrictedMethod
permissionSpecifications: {
...getPermissionSpecifications({
- getAllAccounts: () => this.keyringController.getAccounts(),
+ getAllAccounts: () => keyringController.getAccounts(),
getInternalAccounts:
accountsController.listAccounts.bind(accountsController),
captureKeyringTypesWithMissingIdentities: (
@@ -1014,7 +898,7 @@ class Engine {
});
const keyringTypesWithMissingIdentities =
accountsMissingIdentities.map((address) =>
- this.keyringController.getAccountKeyringType(address),
+ keyringController.getAccountKeyringType(address),
);
const internalAccountCount = internalAccounts.length;
@@ -1063,7 +947,7 @@ class Engine {
});
///: BEGIN:ONLY_INCLUDE_IF(preinstalled-snaps,external-snaps)
- this.subjectMetadataController = new SubjectMetadataController({
+ const subjectMetadataController = new SubjectMetadataController({
// @ts-expect-error TODO: Resolve mismatch between base-controller versions.
messenger: this.controllerMessenger.getRestricted({
name: 'SubjectMetadataController',
@@ -1166,8 +1050,8 @@ class Engine {
`${approvalController.name}:addRequest`,
`${approvalController.name}:updateRequestState`,
`${permissionController.name}:grantPermissions`,
- `${this.subjectMetadataController.name}:getSubjectMetadata`,
- `${this.subjectMetadataController.name}:addSubjectMetadata`,
+ `${subjectMetadataController.name}:getSubjectMetadata`,
+ `${subjectMetadataController.name}:addSubjectMetadata`,
`${phishingController.name}:maybeUpdateState`,
`${phishingController.name}:testOrigin`,
`${snapsRegistry.name}:get`,
@@ -1184,7 +1068,7 @@ class Engine {
],
});
- this.snapController = new SnapController({
+ const snapController = new SnapController({
environmentEndowmentPermissions: Object.values(EndowmentPermissions),
featureFlags: {
requireAllowlist,
@@ -1216,6 +1100,7 @@ class Engine {
const authenticationController = new AuthenticationController.Controller({
state: initialState.AuthenticationController,
+ // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
messenger: this.controllerMessenger.getRestricted({
name: 'AuthenticationController',
allowedActions: [
@@ -1237,6 +1122,7 @@ class Engine {
const userStorageController = new UserStorageController.Controller({
getMetaMetricsState: () => MetaMetrics.getInstance().isEnabled(),
state: initialState.UserStorageController,
+ // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
messenger: this.controllerMessenger.getRestricted({
name: 'UserStorageController',
allowedActions: [
@@ -1249,22 +1135,14 @@ class Engine {
'AuthenticationController:performSignIn',
'NotificationServicesController:disableNotificationServices',
'NotificationServicesController:selectIsNotificationServicesEnabled',
- 'KeyringController:addNewAccount',
- 'AccountsController:listAccounts',
- 'AccountsController:updateAccountMetadata',
- ],
- allowedEvents: [
- 'KeyringController:lock',
- 'KeyringController:unlock',
- 'AccountsController:accountAdded',
- 'AccountsController:accountRenamed',
],
+ allowedEvents: ['KeyringController:unlock', 'KeyringController:lock'],
}),
- nativeScryptCrypto: scrypt,
});
const notificationServicesController =
new NotificationServicesController.Controller({
+ // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
messenger: this.controllerMessenger.getRestricted({
name: 'NotificationServicesController',
allowedActions: [
@@ -1330,8 +1208,6 @@ class Engine {
smartTransactionsController: this.smartTransactionsController,
shouldUseSmartTransaction,
approvalController,
- // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
- controllerMessenger: this.controllerMessenger,
featureFlags: selectSwapsChainFeatureFlags(store.getState()),
}) as Promise<{ transactionHash: string }>;
},
@@ -1375,28 +1251,21 @@ class Engine {
},
// @ts-expect-error at this point in time the provider will be defined by the `networkController.initializeProvider`
provider: networkController.getProviderAndBlockTracker().provider,
- sign: this.keyringController.signTransaction.bind(
- this.keyringController,
+ sign: keyringController.signTransaction.bind(
+ keyringController,
) as unknown as TransactionControllerOptions['sign'],
state: initialState.TransactionController,
});
const codefiTokenApiV2 = new CodefiTokenPricesServiceV2();
- const smartTransactionsControllerTrackMetaMetricsEvent = (
- params: {
- event: MetaMetricsEventName;
- category: MetaMetricsEventCategory;
- properties?: ReturnType;
- sensitiveProperties?: ReturnType<
- typeof getSmartTransactionMetricsSensitiveProperties
- >;
- },
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
- options?: {
- metaMetricsId?: string;
- },
- ) => {
+ const smartTransactionsControllerTrackMetaMetricsEvent = (params: {
+ event: string;
+ category: string;
+ // TODO: Replace "any" with type
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ sensitiveProperties: any;
+ }) => {
const { event, category, ...restParams } = params;
MetaMetrics.getInstance().trackEvent(
@@ -1409,40 +1278,46 @@ class Engine {
restParams,
);
};
- this.smartTransactionsController = new SmartTransactionsController({
- // @ts-expect-error TODO: resolve types
- supportedChainIds: getAllowedSmartTransactionsChainIds(),
- getNonceLock: this.transactionController.getNonceLock.bind(
- this.transactionController,
- ),
- confirmExternalTransaction:
- this.transactionController.confirmExternalTransaction.bind(
+ this.smartTransactionsController = new SmartTransactionsController(
+ {
+ confirmExternalTransaction:
+ this.transactionController.confirmExternalTransaction.bind(
+ this.transactionController,
+ ),
+
+ getNetworkClientById:
+ networkController.getNetworkClientById.bind(networkController),
+ getNonceLock: this.transactionController.getNonceLock.bind(
this.transactionController,
),
- trackMetaMetricsEvent: smartTransactionsControllerTrackMetaMetricsEvent,
- state: initialState.SmartTransactionsController,
- // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
- messenger: this.controllerMessenger.getRestricted({
- name: 'SmartTransactionsController',
- allowedActions: ['NetworkController:getNetworkClientById'],
- allowedEvents: ['NetworkController:stateChange'],
- }),
- getTransactions: this.transactionController.getTransactions.bind(
- this.transactionController,
- ),
- getMetaMetricsProps: () => Promise.resolve({}), // Return MetaMetrics props once we enable HW wallets for smart transactions.
- });
+ getTransactions: this.transactionController.getTransactions.bind(
+ this.transactionController,
+ ),
+ onNetworkStateChange: (listener) =>
+ this.controllerMessenger.subscribe(
+ AppConstants.NETWORK_STATE_CHANGE_EVENT,
+ listener,
+ ),
+
+ // TODO: Replace "any" with type
+ provider:
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ networkController.getProviderAndBlockTracker().provider as any,
+
+ trackMetaMetricsEvent: smartTransactionsControllerTrackMetaMetricsEvent,
+ getMetaMetricsProps: () => Promise.resolve({}), // Return MetaMetrics props once we enable HW wallets for smart transactions.
+ },
+ {
+ // @ts-expect-error TODO: resolve types
+ supportedChainIds: getAllowedSmartTransactionsChainIds(),
+ },
+ initialState.SmartTransactionsController,
+ );
const controllers: Controllers[keyof Controllers][] = [
- this.keyringController,
+ keyringController,
accountTrackerController,
- new AddressBookController({
- messenger: this.controllerMessenger.getRestricted({
- name: 'AddressBookController',
- allowedActions: [],
- allowedEvents: [],
- }),
- }),
+ new AddressBookController(),
assetsContractController,
nftController,
tokensController,
@@ -1586,13 +1461,14 @@ class Engine {
permissionController,
selectedNetworkController,
new SignatureController({
+ // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
messenger: this.controllerMessenger.getRestricted({
name: 'SignatureController',
allowedActions: [
`${approvalController.name}:addRequest`,
- `${this.keyringController.name}:signPersonalMessage`,
- `${this.keyringController.name}:signMessage`,
- `${this.keyringController.name}:signTypedMessage`,
+ `${keyringController.name}:signPersonalMessage`,
+ `${keyringController.name}:signMessage`,
+ `${keyringController.name}:signTypedMessage`,
`${loggingController.name}:add`,
],
allowedEvents: [],
@@ -1605,8 +1481,8 @@ class Engine {
}),
loggingController,
///: BEGIN:ONLY_INCLUDE_IF(preinstalled-snaps,external-snaps)
- this.snapController,
- this.subjectMetadataController,
+ snapController,
+ subjectMetadataController,
authenticationController,
userStorageController,
notificationServicesController,
@@ -1935,20 +1811,6 @@ class Engine {
};
};
- ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
- getSnapKeyring = async () => {
- let [snapKeyring] = this.keyringController.getKeyringsByType(
- KeyringTypes.snap,
- );
- if (!snapKeyring) {
- snapKeyring = await this.keyringController.addNewKeyring(
- KeyringTypes.snap,
- );
- }
- return snapKeyring;
- };
- ///: END:ONLY_INCLUDE_IF
-
/**
* Returns true or false whether the user has funds or not
*/
diff --git a/app/core/EngineService/EngineService.ts b/app/core/EngineService/EngineService.ts
index 7f5334a80f0..d71a7d4d9ae 100644
--- a/app/core/EngineService/EngineService.ts
+++ b/app/core/EngineService/EngineService.ts
@@ -49,10 +49,7 @@ class EngineService {
}
const controllers = [
- {
- name: 'AddressBookController',
- key: `${engine.context.AddressBookController.name}:stateChange`,
- },
+ { name: 'AddressBookController' },
{ name: 'AssetsContractController' },
{ name: 'NftController' },
{
@@ -93,10 +90,7 @@ class EngineService {
name: 'TransactionController',
key: `${engine.context.TransactionController.name}:stateChange`,
},
- {
- name: 'SmartTransactionsController',
- key: `${engine.context.SmartTransactionsController.name}:stateChange`,
- },
+ { name: 'SmartTransactionsController' },
{ name: 'SwapsController' },
{
name: 'TokenListController',
diff --git a/app/core/NotificationManager.js b/app/core/NotificationManager.js
index 3bcf35ee01b..c01a4e1dbfb 100644
--- a/app/core/NotificationManager.js
+++ b/app/core/NotificationManager.js
@@ -1,9 +1,9 @@
'use strict';
+import notifee from '@notifee/react-native';
import Engine from './Engine';
import { hexToBN, renderFromWei } from '../util/number';
import Device from '../util/device';
-import notifee from '@notifee/react-native';
import { STORAGE_IDS } from '../util/notifications/settings/storage/constants';
import { strings } from '../../locales/i18n';
import { AppState } from 'react-native';
@@ -11,9 +11,9 @@ import { AppState } from 'react-native';
import {
NotificationTransactionTypes,
isNotificationsFeatureEnabled,
-
+ requestPushNotificationsPermission,
+ asyncAlert,
} from '../util/notifications';
-
import { safeToChecksumAddress } from '../util/address';
import ReviewManager from './ReviewManager';
import { selectChainId } from '../selectors/networkController';
@@ -152,7 +152,7 @@ class NotificationManager {
title,
body: message,
android: {
- lightUpScreen: true,
+ lightUpScreen: false,
channelId,
smallIcon: 'ic_notification_small',
largeIcon: 'ic_notification',
@@ -179,6 +179,7 @@ class NotificationManager {
} else {
pushData.userInfo = extraData; // check if is still needed
}
+
isNotificationsFeatureEnabled() && notifee.displayNotification(pushData);
} else {
this._showTransactionNotification({
@@ -255,6 +256,11 @@ class NotificationManager {
}
Promise.all(pollPromises);
+ Device.isIos() &&
+ setTimeout(() => {
+ requestPushNotificationsPermission(asyncAlert);
+ }, 5000);
+
// Prompt review
ReviewManager.promptReview();
@@ -485,6 +491,9 @@ export default {
gotIncomingTransaction(lastBlock) {
return instance?.gotIncomingTransaction(lastBlock);
},
+ requestPushNotificationsPermission() {
+ return instance?.requestPushNotificationsPermission(asyncAlert);
+ },
showSimpleNotification(data) {
return instance?.showSimpleNotification(data);
},
diff --git a/app/core/NotificationsManager.test.ts b/app/core/NotificationsManager.test.ts
index 2af79c085b5..bf4e31eab4a 100644
--- a/app/core/NotificationsManager.test.ts
+++ b/app/core/NotificationsManager.test.ts
@@ -1,5 +1,4 @@
import { NotificationTransactionTypes } from '../util/notifications';
-
import NotificationManager, {
constructTitleAndMessage,
} from './NotificationManager';
@@ -45,26 +44,6 @@ describe('NotificationManager', () => {
expect(notificationManager._backgroundMode).toBe(true);
});
- it('calling NotificationManager in _failedCallback mode should call _showNotification', () => {
- notificationManager._failedCallback({
- id: 1,
- txParams: {
- nonce: 1,
- },
- });
- expect(notificationManager._showNotification).toBeInstanceOf(Function);
- });
-
- it('calling NotificationManager onMessageReceived', () => {
- notificationManager.onMessageReceived({
- data: {
- title: 'title',
- shortDescription: 'shortDescription',
- },
- });
- expect(notificationManager.onMessageReceived).toBeInstanceOf(Function);
- });
-
it('calling NotificationManager in background mode OFF should be falsy', () => {
notificationManager._handleAppStateChange('active');
expect(notificationManager._backgroundMode).toBe(false);
@@ -90,16 +69,15 @@ describe('NotificationManager', () => {
expect(NotificationManager.getTransactionToView()).toBeTruthy();
});
- const selectedNotificationTypes: (keyof typeof NotificationTransactionTypes)[] =
- [
- 'pending',
- 'pending_deposit',
- 'pending_withdrawal',
- 'success_withdrawal',
- 'success_deposit',
- 'error',
- 'cancelled',
- ];
+ const selectedNotificationTypes: (keyof typeof NotificationTransactionTypes)[] = [
+ 'pending',
+ 'pending_deposit',
+ 'pending_withdrawal',
+ 'success_withdrawal',
+ 'success_deposit',
+ 'error',
+ 'cancelled',
+ ];
selectedNotificationTypes.forEach((type) => {
it(`should construct title and message for ${type}`, () => {
const { title, message } = constructTitleAndMessage({
diff --git a/app/core/Performance/Performance.test.ts b/app/core/Performance/Performance.test.ts
index a74ec1d6bee..c205b8aded8 100644
--- a/app/core/Performance/Performance.test.ts
+++ b/app/core/Performance/Performance.test.ts
@@ -2,6 +2,10 @@
import Performance from './Performance';
import performance from 'react-native-performance';
+// Extend the global object for __DEV__
+// eslint-disable-next-line @typescript-eslint/no-shadow
+declare const global: { __DEV__: boolean };
+
// Mock react-native-performance
jest.mock('react-native-performance', () => {
const originalModule = jest.requireActual('react-native-performance');
@@ -45,10 +49,9 @@ describe('Performance', () => {
jest.resetAllMocks();
});
- it('should not log performance numbers in production', () => {
- jest.mock('../../util/test/utils', () => ({
- isTest: true, // or false, depending on what you want to test
- }));
+ it('should log performance numbers in development mode', () => {
+ // Mock __DEV__ to be true to simulate development mode
+ global.__DEV__ = true;
// Mock console.info to verify its calls
console.info = jest.fn();
@@ -80,5 +83,22 @@ describe('Performance', () => {
`APP START TIME = MAX(NATIVE LAUNCH TIME, JS BUNDLE LOAD TIME) - 1500ms`,
),
);
+
+ // Clean up
+ global.__DEV__ = false; // Reset __DEV__ to its original state
+ });
+
+ it('should not log performance numbers in non-development mode', () => {
+ // Mock __DEV__ to be true to simulate development mode
+ global.__DEV__ = false;
+
+ // Set up performance service
+ Performance.setupPerformanceObservers();
+
+ // Verify that measure wasn't called
+ expect(performance.measure).not.toHaveBeenCalled();
+
+ // Verify that console.info wasn't called
+ expect(console.info).not.toHaveBeenCalled();
});
});
diff --git a/app/core/Performance/Performance.ts b/app/core/Performance/Performance.ts
index d9d71d76340..545438f1f93 100644
--- a/app/core/Performance/Performance.ts
+++ b/app/core/Performance/Performance.ts
@@ -1,23 +1,16 @@
/* eslint-disable no-console */
import performance, { PerformanceObserver } from 'react-native-performance';
-import StorageWrapper from '../../store/storage-wrapper';
-import { isTest } from '../../util/test/utils';
/**
* Service for measuring app performance
*/
-
-async function setPerformanceValues(appStartTime: number) {
- await StorageWrapper.setItem('appStartTime', appStartTime.toString());
-}
-
class Performance {
/**
* Measures app start and JS bundle loading times
*/
static setupPerformanceObservers = () => {
// Don't run in release mode
- if (!isTest) return;
+ if (!__DEV__) return;
new PerformanceObserver((list) => {
// Get measurement entries
@@ -58,9 +51,6 @@ class Performance {
);
console.info(`-------------------------------------------------------`);
console.info(`-------------------------------------------------------`);
-
- setPerformanceValues(appStartTime);
-
}
}).observe({ type: 'react-native-mark', buffered: true });
};
diff --git a/app/core/SnapKeyring/KeyringSnapPermissions.test.ts b/app/core/SnapKeyring/KeyringSnapPermissions.test.ts
deleted file mode 100644
index 473cc037125..00000000000
--- a/app/core/SnapKeyring/KeyringSnapPermissions.test.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-import {
- SubjectMetadataController,
- SubjectType,
-} from '@metamask/permission-controller';
-import { KeyringRpcMethod } from '@metamask/keyring-api';
-import {
- isProtocolAllowed,
- keyringSnapPermissionsBuilder,
-} from './keyringSnapsPermissions';
-
-const PORTFOLIO_ORIGINS: string[] = [
- 'https://portfolio.metamask.io',
- 'https://dev.portfolio.metamask.io',
- 'https://ramps-dev.portfolio.metamask.io',
-];
-
-describe('keyringSnapPermissionsBuilder', () => {
- const mockController = new SubjectMetadataController({
- subjectCacheLimit: 100,
- messenger: {
- registerActionHandler: jest.fn(),
- registerInitialEventPayload: jest.fn(),
- publish: jest.fn(),
- // TODO: Replace `any` with type
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- } as any,
- state: {},
- });
- mockController.addSubjectMetadata({
- origin: 'https://some-dapp.com',
- subjectType: SubjectType.Website,
- });
-
- describe('Portfolio origin', () => {
- it.each(PORTFOLIO_ORIGINS)(
- 'returns the methods that can be called by %s',
- (origin: string) => {
- const permissions = keyringSnapPermissionsBuilder(origin);
- expect(permissions()).toStrictEqual([
- KeyringRpcMethod.ListAccounts,
- KeyringRpcMethod.GetAccount,
- KeyringRpcMethod.GetAccountBalances,
- KeyringRpcMethod.SubmitRequest,
- ]);
- },
- );
- it.each(PORTFOLIO_ORIGINS)(
- '%s cannot create an account',
- (origin: string) => {
- const permissions = keyringSnapPermissionsBuilder(origin);
- expect(permissions()).not.toContain(KeyringRpcMethod.CreateAccount);
- },
- );
- it.each(PORTFOLIO_ORIGINS)('%s can submit a request', (origin: string) => {
- const permissions = keyringSnapPermissionsBuilder(origin);
- expect(permissions()).toContain(KeyringRpcMethod.SubmitRequest);
- });
- });
-
- it('returns the methods metamask can call', () => {
- const permissions = keyringSnapPermissionsBuilder('metamask');
- expect(permissions()).toStrictEqual([
- KeyringRpcMethod.ListAccounts,
- KeyringRpcMethod.GetAccount,
- KeyringRpcMethod.FilterAccountChains,
- KeyringRpcMethod.DeleteAccount,
- KeyringRpcMethod.ListRequests,
- KeyringRpcMethod.GetRequest,
- KeyringRpcMethod.SubmitRequest,
- KeyringRpcMethod.RejectRequest,
- ]);
- });
-
- it('returns the methods a known origin can call', () => {
- const permissions = keyringSnapPermissionsBuilder('https://some-dapp.com');
- expect(permissions()).toStrictEqual([
- KeyringRpcMethod.ListAccounts,
- KeyringRpcMethod.GetAccount,
- KeyringRpcMethod.CreateAccount,
- KeyringRpcMethod.FilterAccountChains,
- KeyringRpcMethod.UpdateAccount,
- KeyringRpcMethod.DeleteAccount,
- KeyringRpcMethod.ExportAccount,
- KeyringRpcMethod.ListRequests,
- KeyringRpcMethod.GetRequest,
- KeyringRpcMethod.ApproveRequest,
- KeyringRpcMethod.RejectRequest,
- ]);
- });
-
- it('returns the methods an unknown origin can call', () => {
- const permissions = keyringSnapPermissionsBuilder(
- 'https://some-other-dapp.com',
- );
- expect(permissions()).toStrictEqual([
- KeyringRpcMethod.ListAccounts,
- KeyringRpcMethod.GetAccount,
- KeyringRpcMethod.CreateAccount,
- KeyringRpcMethod.FilterAccountChains,
- KeyringRpcMethod.UpdateAccount,
- KeyringRpcMethod.DeleteAccount,
- KeyringRpcMethod.ExportAccount,
- KeyringRpcMethod.ListRequests,
- KeyringRpcMethod.GetRequest,
- KeyringRpcMethod.ApproveRequest,
- KeyringRpcMethod.RejectRequest,
- ]);
- });
-
- it.each([
- '',
- 'null',
- 'sftp://some-dapp.com',
- 'http://some-dapp.com',
- '0',
- undefined,
- null,
- true,
- false,
- 1,
- 0,
- -1,
- ])('"%s" cannot call any methods', (origin: unknown) => {
- const permissions = keyringSnapPermissionsBuilder(
- // TODO: Replace `any` with type
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- origin as any,
- );
- expect(permissions()).toStrictEqual([]);
- });
-});
-
-describe('isProtocolAllowed', () => {
- it.each([
- ['http://some-dapp.com', false],
- ['https://some-dapp.com', true],
- ['sftp://some-dapp.com', false],
- ['', false],
- ['null', false],
- ['0', false],
- [undefined, false],
- [null, false],
- [true, false],
- [false, false],
- [1, false],
- [0, false],
- [-1, false],
- // TODO: Replace `any` with type
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- ])('"%s" cannot call any methods', (origin: any, expected: boolean) => {
- expect(isProtocolAllowed(origin)).toBe(expected);
- });
-});
diff --git a/app/core/SnapKeyring/SnapKeyring.test.ts b/app/core/SnapKeyring/SnapKeyring.test.ts
deleted file mode 100644
index fad726e0294..00000000000
--- a/app/core/SnapKeyring/SnapKeyring.test.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-import { ControllerMessenger } from '@metamask/base-controller';
-import {
- EthAccountType,
- InternalAccount,
- KeyringEvent,
-} from '@metamask/keyring-api';
-import { snapKeyringBuilder } from './SnapKeyring';
-import {
- SnapKeyringBuilderAllowActions,
- SnapKeyringBuilderMessenger,
-} from './types';
-import { SnapId } from '@metamask/snaps-sdk';
-
-const mockGetAccounts = jest.fn();
-const mockSnapId: SnapId = 'snapId' as SnapId;
-const mockSnapName = 'mock-snap';
-const mockSnapController = jest.fn();
-const mockPersisKeyringHelper = jest.fn();
-const mockSetSelectedAccount = jest.fn();
-const mockRemoveAccountHelper = jest.fn();
-const mockGetAccountByAddress = jest.fn();
-
-const address = '0x2a4d4b667D5f12C3F9Bf8F14a7B9f8D8d9b8c8fA';
-const accountNameSuggestion = 'Suggested Account Name';
-const mockAccount = {
- type: EthAccountType.Eoa,
- id: '3afa663e-0600-4d93-868a-61c2e553013b',
- address,
- methods: [],
- options: {},
-};
-const mockInternalAccount = {
- ...mockAccount,
- metadata: {
- snap: {
- enabled: true,
- id: mockSnapId,
- name: mockSnapName,
- },
- name: accountNameSuggestion,
- keyring: {
- type: '',
- },
- importTime: 0,
- },
-};
-
-const createControllerMessenger = ({
- account = mockInternalAccount,
-}: {
- account?: InternalAccount;
-} = {}): SnapKeyringBuilderMessenger => {
- const messenger = new ControllerMessenger<
- SnapKeyringBuilderAllowActions,
- never
- >().getRestricted({
- name: 'SnapKeyringBuilder',
- allowedActions: [
- 'ApprovalController:addRequest',
- 'ApprovalController:acceptRequest',
- 'ApprovalController:rejectRequest',
- 'ApprovalController:startFlow',
- 'ApprovalController:endFlow',
- 'ApprovalController:showSuccess',
- 'ApprovalController:showError',
- 'PhishingController:maybeUpdateState',
- 'KeyringController:getAccounts',
- 'AccountsController:setSelectedAccount',
- 'AccountsController:getAccountByAddress',
- ],
- allowedEvents: [],
- });
-
- jest.spyOn(messenger, 'call').mockImplementation((...args) => {
- // This mock implementation does not have a nice discriminate union where types/parameters can be correctly inferred
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- const [actionType, ...params]: any[] = args;
-
- switch (actionType) {
- case 'KeyringController:getAccounts':
- return mockGetAccounts.mockResolvedValue([])();
-
- case 'AccountsController:getAccountByAddress':
- return mockGetAccountByAddress.mockReturnValue(account)(params);
-
- case 'AccountsController:setSelectedAccount':
- return mockSetSelectedAccount(params);
-
- default:
- throw new Error(
- `MOCK_FAIL - unsupported messenger call: ${actionType}`,
- );
- }
- });
-
- return messenger;
-};
-
-const createSnapKeyringBuilder = () =>
- snapKeyringBuilder(
- createControllerMessenger(),
- mockSnapController,
- mockPersisKeyringHelper,
- mockRemoveAccountHelper,
- );
-
-describe('Snap Keyring Methods', () => {
- afterEach(() => {
- jest.resetAllMocks();
- });
-
- describe('addAccount', () => {
- afterEach(() => {
- jest.resetAllMocks();
- });
-
- it('handles account creation with without a user defined name', async () => {
- const builder = createSnapKeyringBuilder();
- await builder().handleKeyringSnapMessage(mockSnapId, {
- method: KeyringEvent.AccountCreated,
- params: {
- account: mockAccount,
- displayConfirmation: true,
- },
- });
- expect(mockPersisKeyringHelper).toHaveBeenCalledTimes(2);
- expect(mockGetAccountByAddress).toHaveBeenCalledTimes(1);
- expect(mockGetAccountByAddress).toHaveBeenCalledWith([
- mockAccount.address.toLowerCase(),
- ]);
- });
- });
-});
diff --git a/app/core/SnapKeyring/SnapKeyring.ts b/app/core/SnapKeyring/SnapKeyring.ts
deleted file mode 100644
index ec5e9e5659f..00000000000
--- a/app/core/SnapKeyring/SnapKeyring.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import { SnapKeyring } from '@metamask/eth-snap-keyring';
-import type { SnapController } from '@metamask/snaps-controllers';
-import { SnapKeyringBuilderMessenger } from './types';
-import Logger from '../../util/Logger';
-
-/**
- * Constructs a SnapKeyring builder with specified handlers for managing snap accounts.
- * - Here is the equivalent function on the extension: https://github.com/MetaMask/metamask-extension/blob/develop/app/scripts/lib/snap-keyring/snap-keyring.ts#L111
- *
- * @param controllerMessenger - The controller messenger instance.
- * @param getSnapController - A function that retrieves the Snap Controller instance.
- * @param persistKeyringHelper - A function that persists all keyrings in the vault.
- * @param removeAccountHelper - A function to help remove an account based on its address.
- * @returns The constructed SnapKeyring builder instance with the following methods:
- * - `saveState`: Persists all keyrings in the keyring controller.
- * - `addAccount`: Initiates the process of adding an account with user confirmation and handling the user input.
- * - `removeAccount`: Initiates the process of removing an account with user confirmation and handling the user input.
- * - `redirectUser`: Redirects the user to a specified URL with a message to complete signing. This method is used to handle asynchronous signing requests.
- * - `addressExists`: Returns a boolean indicating if an address exists in the keyring.
- */
-export const snapKeyringBuilder = (
- controllerMessenger: SnapKeyringBuilderMessenger,
- getSnapController: () => SnapController,
- persistKeyringHelper: () => Promise,
- removeAccountHelper: (address: string) => Promise,
-): { (): SnapKeyring; type: string } => {
- const builder = () =>
- new SnapKeyring(getSnapController(), {
- addressExists: async (address) =>
- (
- await controllerMessenger.call('KeyringController:getAccounts')
- ).includes(address.toLowerCase()),
-
- redirectUser: async (snapId: string, url: string, message: string) => {
- Logger.log(
- `SnapKeyring: redirectUser called with \n
- - snapId: ${snapId} \n
- - url: ${url} \n
- - message: ${message} \n`,
- );
- },
-
- saveState: async () => {
- await persistKeyringHelper();
- },
-
- addAccount: async (
- address: string,
- snapId: string,
- handleUserInput: (accepted: boolean) => Promise,
- accountNameSuggestion = '',
- displayConfirmation = false,
- ) => {
- // TODO: Implement proper snap account confirmations. Currently, we are approving everything for testing purposes.
- Logger.log(
- `SnapKeyring: addAccount called with \n
- - address: ${address} \n
- - handleUserInput: ${handleUserInput} \n
- - snapId: ${snapId} \n
- - accountNameSuggestion: ${accountNameSuggestion} \n
- - displayConfirmation: ${displayConfirmation}`,
- );
-
- // Approve everything for now because we have not implemented snap account confirmations yet
- await handleUserInput(true);
- await persistKeyringHelper();
- const account = controllerMessenger.call(
- 'AccountsController:getAccountByAddress',
- address,
- );
- if (!account) {
- throw new Error(`Internal account not found for address: ${address}`);
- }
-
- // Set the selected account to the new account
- controllerMessenger.call(
- 'AccountsController:setSelectedAccount',
- account.id,
- );
- },
-
- removeAccount: async (
- address: string,
- snapId: string,
- handleUserInput: (accepted: boolean) => Promise,
- ) => {
- // TODO: Implement proper snap account confirmations. Currently, we are approving everything for testing purposes.
- Logger.log(
- `SnapKeyring: removeAccount called with \n
- - address: ${address} \n
- - handleUserInput: ${handleUserInput} \n
- - snapId: ${snapId} \n`,
- );
- // Approve everything for now because we have not implemented snap account confirmations yet
- await handleUserInput(true);
- await removeAccountHelper(address);
- await persistKeyringHelper();
- },
- });
- builder.type = SnapKeyring.type;
- return builder;
-};
diff --git a/app/core/SnapKeyring/index.ts b/app/core/SnapKeyring/index.ts
deleted file mode 100644
index 5ad5c16f3aa..00000000000
--- a/app/core/SnapKeyring/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { snapKeyringBuilder } from './SnapKeyring';
diff --git a/app/core/SnapKeyring/keyringSnapsPermissions.ts b/app/core/SnapKeyring/keyringSnapsPermissions.ts
deleted file mode 100644
index cde232c37de..00000000000
--- a/app/core/SnapKeyring/keyringSnapsPermissions.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-/* eslint-disable no-console */
-import { KeyringRpcMethod } from '@metamask/keyring-api';
-
-/**
- * The origins of the Portfolio dapp.
- */
-const PORTFOLIO_ORIGINS: string[] = [
- 'https://portfolio.metamask.io',
- ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
- 'https://dev.portfolio.metamask.io',
- 'https://stage.portfolio.metamask.io',
- 'https://ramps-dev.portfolio.metamask.io',
- 'https://portfolio-builds.metafi-dev.codefi.network',
- ///: END:ONLY_INCLUDE_IF
-];
-
-/**
- * List of keyring methods MetaMask can call.
- */
-const METAMASK_ALLOWED_METHODS: string[] = [
- KeyringRpcMethod.ListAccounts,
- KeyringRpcMethod.GetAccount,
- KeyringRpcMethod.FilterAccountChains,
- KeyringRpcMethod.DeleteAccount,
- KeyringRpcMethod.ListRequests,
- KeyringRpcMethod.GetRequest,
- KeyringRpcMethod.SubmitRequest,
- KeyringRpcMethod.RejectRequest,
-];
-
-/**
- * List of keyring methods a dapp can call.
- * !NOTE: DO NOT INCLUDE `KeyringRpcMethod.SubmitRequest` IN THIS LIST.
- */
-const WEBSITE_ALLOWED_METHODS: string[] = [
- KeyringRpcMethod.ListAccounts,
- KeyringRpcMethod.GetAccount,
- KeyringRpcMethod.CreateAccount,
- KeyringRpcMethod.FilterAccountChains,
- KeyringRpcMethod.UpdateAccount,
- KeyringRpcMethod.DeleteAccount,
- KeyringRpcMethod.ExportAccount,
- KeyringRpcMethod.ListRequests,
- KeyringRpcMethod.GetRequest,
- KeyringRpcMethod.ApproveRequest,
- KeyringRpcMethod.RejectRequest,
-];
-
-/**
- * List of keyring methods that Portfolio can call.
- */
-const PORTFOLIO_ALLOWED_METHODS: string[] = [
- KeyringRpcMethod.ListAccounts,
- KeyringRpcMethod.GetAccount,
- KeyringRpcMethod.GetAccountBalances,
- KeyringRpcMethod.SubmitRequest,
-];
-
-/**
- * List of allowed protocols. On Flask, HTTP is also allowed for testing.
- */
-const ALLOWED_PROTOCOLS: string[] = [
- 'https:',
-];
-
-/**
- * Checks if the protocol of the origin is allowed.
- *
- * @param origin - The origin to check.
- * @returns `true` if the protocol of the origin is allowed, `false` otherwise.
- */
-export function isProtocolAllowed(origin: string): boolean {
- try {
- const url = new URL(origin);
- return ALLOWED_PROTOCOLS.includes(url.protocol);
- } catch (error) {
- return false;
- }
-}
-
-/**
- * Builds a function that returns the list of keyring methods an origin can
- * call.
- * - Here is the equivalent function on the extension: https://github.com/MetaMask/metamask-extension/blob/develop/app/scripts/lib/snap-keyring/keyring-snaps-permissions.ts#L96
- * @param controller - Reference to the `SubjectMetadataController`.
- * @param origin - The origin itself.
- * @returns A function that returns the list of keyring methods an origin can
- * call.
- */
-export function keyringSnapPermissionsBuilder(
- origin: string,
-): () => string[] {
- return () => {
- if (origin === 'metamask') {
- return METAMASK_ALLOWED_METHODS;
- }
-
- if (PORTFOLIO_ORIGINS.includes(origin)) {
- return PORTFOLIO_ALLOWED_METHODS;
- }
- return isProtocolAllowed(origin) ? WEBSITE_ALLOWED_METHODS : [];
- };
-}
diff --git a/app/core/SnapKeyring/types.ts b/app/core/SnapKeyring/types.ts
deleted file mode 100644
index 701198d1d50..00000000000
--- a/app/core/SnapKeyring/types.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { RestrictedControllerMessenger } from '@metamask/base-controller';
-import { MaybeUpdateState, TestOrigin } from '@metamask/phishing-controller';
-import type { KeyringControllerGetAccountsAction } from '@metamask/keyring-controller';
-import { GetSubjectMetadata } from '@metamask/permission-controller';
-import {
- AccountsControllerGetAccountByAddressAction,
- AccountsControllerSetAccountNameAction,
- AccountsControllerSetSelectedAccountAction,
-} from '@metamask/accounts-controller';
-import type {
- AcceptRequest,
- AddApprovalRequest,
- EndFlow,
- RejectRequest,
- ShowError,
- ShowSuccess,
- StartFlow,
-} from '@metamask/approval-controller';
-
-export type SnapKeyringBuilderAllowActions =
- | StartFlow
- | EndFlow
- | ShowSuccess
- | ShowError
- | AddApprovalRequest
- | AcceptRequest
- | RejectRequest
- | MaybeUpdateState
- | TestOrigin
- | KeyringControllerGetAccountsAction
- | GetSubjectMetadata
- | AccountsControllerSetSelectedAccountAction
- | AccountsControllerGetAccountByAddressAction
- | AccountsControllerSetAccountNameAction;
-
-export type SnapKeyringBuilderMessenger = RestrictedControllerMessenger<
- 'SnapKeyringBuilder',
- SnapKeyringBuilderAllowActions,
- never,
- SnapKeyringBuilderAllowActions['type'],
- never
->;
diff --git a/app/core/Snaps/SnapBridge.ts b/app/core/Snaps/SnapBridge.ts
index 5a9c468dc65..858bcdcd9fc 100644
--- a/app/core/Snaps/SnapBridge.ts
+++ b/app/core/Snaps/SnapBridge.ts
@@ -162,7 +162,9 @@ export default class SnapBridge {
engine.push(filterMiddleware);
engine.push(subscriptionManager.middleware);
- const { context, controllerMessenger } = Engine;
+ // TODO: Replace "any" with type
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ const { context, controllerMessenger } = Engine as any;
const { PermissionController } = context;
engine.push(
diff --git a/app/core/Snaps/SnapsMethodMiddleware.ts b/app/core/Snaps/SnapsMethodMiddleware.ts
index c2ad0d4f3ae..47bc9ae7372 100644
--- a/app/core/Snaps/SnapsMethodMiddleware.ts
+++ b/app/core/Snaps/SnapsMethodMiddleware.ts
@@ -4,25 +4,16 @@ import {
RequestedPermissions,
SubjectType,
} from '@metamask/permission-controller';
-import { SnapRpcHookArgs } from '@metamask/snaps-utils';
import { RestrictedMethods } from '../Permissions/constants';
-import { keyringSnapPermissionsBuilder } from '../SnapKeyring/keyringSnapsPermissions';
-import { SnapId } from '@metamask/snaps-sdk';
-import { EngineContext } from '../Engine';
-import { handleSnapRequest } from './utils';
-export function getSnapIdFromRequest(
- request: Record,
-): SnapId | null {
- const { snapId } = request;
- return typeof snapId === 'string' ? snapId as SnapId : null;
-}
// Snaps middleware
/*
from extension https://github.dev/MetaMask/metamask-extension/blob/1d5e8a78400d7aaaf2b3cbdb30cff9399061df34/app/scripts/metamask-controller.js#L3830-L3861
*/
const snapMethodMiddlewareBuilder = (
- engineContext: EngineContext,
+ // TODO: Replace "any" with type
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ engineContext: any,
// TODO: Replace "any" with type
// eslint-disable-next-line @typescript-eslint/no-explicit-any
controllerMessenger: any,
@@ -45,11 +36,6 @@ const snapMethodMiddlewareBuilder = (
engineContext.PermissionController,
origin,
),
- hasPermission: engineContext.PermissionController.hasPermission.bind(
- engineContext.PermissionController,
- origin,
- ),
- getAllowedKeyringMethods: keyringSnapPermissionsBuilder(origin),
getSnapFile: controllerMessenger.call.bind(
controllerMessenger,
'SnapController:getFile',
@@ -65,26 +51,6 @@ const snapMethodMiddlewareBuilder = (
origin,
RestrictedMethods.wallet_snap,
),
- getSnap: controllerMessenger.call.bind(
- controllerMessenger,
- 'SnapController:get',
- ),
- handleSnapRpcRequest: async (request: Omit) => {
- const snapId = getSnapIdFromRequest(request);
-
- if (!snapId) {
- throw new Error(
- 'snapMethodMiddlewareBuilder handleSnapRpcRequest: Invalid snap request: snapId not found',
- );
- }
-
- return await handleSnapRequest(controllerMessenger, {
- snapId,
- origin,
- handler: request.handler,
- request: request.request,
- });
- },
});
export default snapMethodMiddlewareBuilder;
diff --git a/app/core/Snaps/permissions/permissions.ts b/app/core/Snaps/permissions/permissions.ts
index c0eb81bd2f1..acf658902d2 100644
--- a/app/core/Snaps/permissions/permissions.ts
+++ b/app/core/Snaps/permissions/permissions.ts
@@ -9,6 +9,5 @@ export const EndowmentPermissions = Object.freeze({
'endowment:cronjob': 'endowment:cronjob',
'endowment:ethereum-provider': 'endowment:ethereum-provider',
'endowment:rpc': 'endowment:rpc',
- 'endowment:keyring': 'endowment:keyring',
} as const);
///: END:ONLY_INCLUDE_IF
diff --git a/app/core/Snaps/types.ts b/app/core/Snaps/types.ts
deleted file mode 100644
index 025b64f4fd0..00000000000
--- a/app/core/Snaps/types.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { SnapId } from '@metamask/snaps-sdk';
-import { SnapRpcHookArgs } from '@metamask/snaps-utils';
-
-export type HandleSnapRequestArgs = SnapRpcHookArgs & { snapId: SnapId };
diff --git a/app/core/Snaps/utils.ts b/app/core/Snaps/utils.ts
deleted file mode 100644
index ac2157dc785..00000000000
--- a/app/core/Snaps/utils.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { ControllerMessenger } from '../Engine';
-import { HandleSnapRequestArgs } from './types';
-
-/**
- * Passes a JSON-RPC request object to the SnapController for execution.
- *
- * @param {object} args - A bag of options.
- * @param {string} args.snapId - The ID of the recipient snap.
- * @param {string} args.origin - The origin of the RPC request.
- * @param {string} args.handler - The handler to trigger on the snap for the request.
- * @param {object} args.request - The JSON-RPC request object.
- * @returns The result of the JSON-RPC request.
- */
-export async function handleSnapRequest(
- controllerMessenger: ControllerMessenger,
- args: HandleSnapRequestArgs,
-) {
- return await controllerMessenger.call('SnapController:handleRequest', args);
-}
diff --git a/app/core/__mocks__/MockedEngine.ts b/app/core/__mocks__/MockedEngine.ts
index dcdde0ec33c..104f346e2be 100644
--- a/app/core/__mocks__/MockedEngine.ts
+++ b/app/core/__mocks__/MockedEngine.ts
@@ -1,13 +1,38 @@
+import { KeyringTypes } from '@metamask/keyring-controller';
import { CHAIN_IDS } from '@metamask/transaction-controller';
import { mockNetworkState } from '../../util/test/network';
import { NetworkClientId } from '@metamask/network-controller';
import Engine from '../../core/Engine';
-import { MOCK_KEYRING_CONTROLLER_STATE } from '../../util/test/keyringControllerTestUtils';
export const mockedEngine = {
init: () => Engine.init({}),
context: {
- KeyringController: MOCK_KEYRING_CONTROLLER_STATE,
+ KeyringController: {
+ keyring: {
+ keyrings: [
+ {
+ mnemonic:
+ 'one two three four five six seven eight nine ten eleven twelve',
+ },
+ ],
+ },
+ state: {
+ keyrings: [
+ {
+ accounts: ['0xd018538C87232FF95acbCe4870629b75640a78E7'],
+ type: KeyringTypes.simple,
+ },
+ {
+ accounts: ['0xB374Ca013934e498e5baD3409147F34E6c462389'],
+ type: KeyringTypes.qr,
+ },
+ {
+ accounts: ['0x71C7656EC7ab88b098defB751B7401B5f6d8976F'],
+ type: KeyringTypes.hd,
+ },
+ ],
+ },
+ },
NetworkController: {
getNetworkClientById: (networkClientId: NetworkClientId) => {
if (networkClientId === 'linea_goerli') {
diff --git a/app/declarations/index.d.ts b/app/declarations/index.d.ts
index 094baa70c44..04d7a1238f9 100644
--- a/app/declarations/index.d.ts
+++ b/app/declarations/index.d.ts
@@ -6,8 +6,6 @@ declare module '@metamask/react-native-payments/lib/js/__mocks__';
declare module 'react-native-fade-in-image';
-declare module 'react-native-fast-crypto';
-
declare module 'react-native-minimizer';
declare module 'xhr2';
diff --git a/app/lib/snaps/SnapsExecutionWebView.tsx b/app/lib/snaps/SnapsExecutionWebView.tsx
index 24b8e99a087..157ef74df69 100644
--- a/app/lib/snaps/SnapsExecutionWebView.tsx
+++ b/app/lib/snaps/SnapsExecutionWebView.tsx
@@ -1,10 +1,13 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+/* eslint-disable @typescript-eslint/no-require-imports */
+/* eslint-disable import/no-commonjs */
///: BEGIN:ONLY_INCLUDE_IF(preinstalled-snaps,external-snaps)
import React, { Component, RefObject } from 'react';
import { View, ScrollView, NativeSyntheticEvent } from 'react-native';
-import { WebViewMessageEvent, WebView } from '@metamask/react-native-webview';
+import WebView, { WebViewMessageEvent } from '@metamask/react-native-webview';
import { createStyles } from './styles';
+import { WebViewInterface } from '@metamask/snaps-controllers/dist/types/services/webview/WebViewMessageStream';
import { WebViewError } from '@metamask/react-native-webview/lib/WebViewTypes';
-import { WebViewInterface } from '@metamask/snaps-controllers/react-native';
import { PostMessageEvent } from '@metamask/post-message-stream';
const SNAPS_EE_URL = 'https://execution.metamask.io/webview/6.7.1/index.html';
diff --git a/app/reducers/index.ts b/app/reducers/index.ts
index 51f397e1128..df18eae36c8 100644
--- a/app/reducers/index.ts
+++ b/app/reducers/index.ts
@@ -33,6 +33,7 @@ import smartTransactionsReducer from '../core/redux/slices/smartTransactions';
import transactionMetricsReducer from '../core/redux/slices/transactionMetrics';
import originThrottlingReducer from '../core/redux/slices/originThrottling';
import notificationsAccountsProvider from '../core/redux/slices/notifications';
+
/**
* Infer state from a reducer
*
diff --git a/app/selectors/addressBookController.test.ts b/app/selectors/addressBookController.test.ts
index e63d2e954fa..5f80f6e1c1c 100644
--- a/app/selectors/addressBookController.test.ts
+++ b/app/selectors/addressBookController.test.ts
@@ -1,10 +1,10 @@
import { RootState } from '../reducers';
import { selectAddressBook } from './addressBookController';
-import { AddressBookControllerState } from '@metamask/address-book-controller';
+import { AddressBookState } from '@metamask/address-book-controller';
describe('selectAddressBook', () => {
it('returns addressBook from state', () => {
- const mockAddressBookControllerState: AddressBookControllerState = {
+ const mockAddressBookState: AddressBookState = {
addressBook: {
'0x1': {
'0x123': {
@@ -21,13 +21,13 @@ describe('selectAddressBook', () => {
const mockState = {
engine: {
backgroundState: {
- AddressBookController: mockAddressBookControllerState,
+ AddressBookController: mockAddressBookState,
},
},
};
expect(selectAddressBook(mockState as RootState)).toEqual(
- mockAddressBookControllerState.addressBook,
+ mockAddressBookState.addressBook,
);
});
});
diff --git a/app/selectors/addressBookController.ts b/app/selectors/addressBookController.ts
index eff948309b4..c734a075f2c 100644
--- a/app/selectors/addressBookController.ts
+++ b/app/selectors/addressBookController.ts
@@ -1,12 +1,12 @@
import { RootState } from '../reducers';
import { createSelector } from 'reselect';
-import { AddressBookControllerState } from '@metamask/address-book-controller';
+import { AddressBookState } from '@metamask/address-book-controller';
export const selectAddressBookControllerState = (state: RootState) =>
state.engine.backgroundState.AddressBookController;
export const selectAddressBook = createSelector(
selectAddressBookControllerState,
- (addressBookControllerState: AddressBookControllerState) =>
+ (addressBookControllerState: AddressBookState) =>
addressBookControllerState.addressBook,
);
diff --git a/app/selectors/types.ts b/app/selectors/types.ts
index 5b0c2e6281b..5bf4921a87c 100644
--- a/app/selectors/types.ts
+++ b/app/selectors/types.ts
@@ -11,7 +11,7 @@ import {
} from '@metamask/assets-controllers';
import SwapsController from '@metamask/swaps-controller';
import { NetworkState } from '@metamask/network-controller';
-import { AddressBookControllerState } from '@metamask/address-book-controller';
+import { AddressBookState } from '@metamask/address-book-controller';
import { BaseState } from '@metamask/base-controller';
import { KeyringControllerMemState } from '@metamask/keyring-controller';
import { PreferencesState } from '@metamask/preferences-controller';
@@ -28,7 +28,7 @@ export interface EngineState {
engine: {
backgroundState: {
AccountTrackerController: AccountTrackerState;
- AddressBookController: AddressBookControllerState;
+ AddressBookController: AddressBookState;
AssetsContractController: BaseState;
NftController: NftState;
TokenListController: TokenListState;
diff --git a/app/store/migrations/029.ts b/app/store/migrations/029.ts
index f98e171d70b..0431c101b0d 100644
--- a/app/store/migrations/029.ts
+++ b/app/store/migrations/029.ts
@@ -9,7 +9,7 @@ import { TransactionParams } from '@metamask/transaction-controller';
import { captureException } from '@sentry/react-native';
import {
AddressBookEntry,
- AddressBookControllerState,
+ AddressBookState,
} from '@metamask/address-book-controller';
import {
Nft,
@@ -211,7 +211,7 @@ export default async function migrate(stateAsync: unknown) {
state?.engine?.backgroundState?.AddressBookController;
const newAddressBookControllerState = state?.engine?.backgroundState
- ?.AddressBookController as AddressBookControllerState;
+ ?.AddressBookController as AddressBookState;
if (!isObject(addressBookControllerState)) {
captureException(
diff --git a/app/util/address/index.test.ts b/app/util/address/index.test.ts
index 763059d0ba5..e19035c34d2 100644
--- a/app/util/address/index.test.ts
+++ b/app/util/address/index.test.ts
@@ -15,37 +15,6 @@ import {
getKeyringByAddress,
getLabelTextByAddress,
} from '.';
-import {
- mockHDKeyringAddress,
- mockQrKeyringAddress,
- mockSimpleKeyringAddress,
-} from '../test/keyringControllerTestUtils';
-
-const snapAddress = '0xC4955C0d639D99699Bfd7Ec54d9FaFEe40e4D272';
-
-jest.mock('../../core/Engine', () => {
- const { KeyringTypes } = jest.requireActual('@metamask/keyring-controller');
- const { MOCK_KEYRING_CONTROLLER_STATE } = jest.requireActual(
- '../test/keyringControllerTestUtils',
- );
- return {
- context: {
- KeyringController: {
- ...MOCK_KEYRING_CONTROLLER_STATE,
- state: {
- keyrings: [
- ...MOCK_KEYRING_CONTROLLER_STATE.state.keyrings,
- {
- accounts: [snapAddress],
- index: 0,
- type: KeyringTypes.snap,
- },
- ],
- },
- },
- },
- };
-});
describe('isENS', () => {
it('should return false by default', () => {
@@ -263,13 +232,19 @@ describe('isQRHardwareAccount', () => {
});
it('should return false if address is from keyring type simple', () => {
- expect(isQRHardwareAccount(mockSimpleKeyringAddress)).toBeFalsy();
+ expect(
+ isQRHardwareAccount('0xd018538C87232FF95acbCe4870629b75640a78E7'),
+ ).toBeFalsy();
});
it('should return false if address is from keyring type hd', () => {
- expect(isQRHardwareAccount(mockHDKeyringAddress)).toBeFalsy();
+ expect(
+ isQRHardwareAccount('0x71C7656EC7ab88b098defB751B7401B5f6d8976F'),
+ ).toBeFalsy();
});
it('should return true if address is from keyring type qr', () => {
- expect(isQRHardwareAccount(mockQrKeyringAddress)).toBeTruthy();
+ expect(
+ isQRHardwareAccount('0xB374Ca013934e498e5baD3409147F34E6c462389'),
+ ).toBeTruthy();
});
});
describe('getKeyringByAddress', () => {
@@ -282,7 +257,9 @@ describe('getKeyringByAddress', () => {
expect(getKeyringByAddress('ens.eth')).toBeUndefined();
});
it('should return address if found', () => {
- expect(getKeyringByAddress(mockQrKeyringAddress)).not.toBe(undefined);
+ expect(
+ getKeyringByAddress('0xB374Ca013934e498e5baD3409147F34E6c462389'),
+ ).not.toBe(undefined);
});
it('should return null if address not found', () => {
expect(
@@ -292,7 +269,9 @@ describe('getKeyringByAddress', () => {
});
describe('isHardwareAccount,', () => {
it('should return true if account is a QR keyring', () => {
- expect(isHardwareAccount(mockQrKeyringAddress)).toBeTruthy();
+ expect(
+ isHardwareAccount('0xB374Ca013934e498e5baD3409147F34E6c462389'),
+ ).toBeTruthy();
});
it('should return false if account is not a hardware keyring', () => {
@@ -302,26 +281,16 @@ describe('isHardwareAccount,', () => {
});
});
describe('getLabelTextByAddress,', () => {
- beforeEach(() => {
- jest.resetAllMocks();
- });
-
it('should return accounts.qr_hardware if account is a QR keyring', () => {
- expect(getLabelTextByAddress(mockQrKeyringAddress)).toBe(
- 'accounts.qr_hardware',
- );
+ expect(
+ getLabelTextByAddress('0xB374Ca013934e498e5baD3409147F34E6c462389'),
+ ).toBe('accounts.qr_hardware');
});
it('should return KeyringTypes.simple if address is a imported account', () => {
- expect(getLabelTextByAddress(mockSimpleKeyringAddress)).toBe(
- 'accounts.imported',
- );
- });
-
- it('returns "Snaps (beta)" if account is a Snap keyring', () => {
- expect(getLabelTextByAddress(snapAddress)).toBe(
- 'accounts.snap_account_tag',
- );
+ expect(
+ getLabelTextByAddress('0xd018538C87232FF95acbCe4870629b75640a78E7'),
+ ).toBe('accounts.imported');
});
it('should return null if address is empty', () => {
@@ -343,13 +312,19 @@ describe('getAddressAccountType', () => {
);
});
it('should return QR if address is from a keyring type qr', () => {
- expect(getAddressAccountType(mockQrKeyringAddress)).toBe('QR');
+ expect(
+ getAddressAccountType('0xB374Ca013934e498e5baD3409147F34E6c462389'),
+ ).toBe('QR');
});
it('should return imported if address is from a keyring type simple', () => {
- expect(getAddressAccountType(mockSimpleKeyringAddress)).toBe('Imported');
+ expect(
+ getAddressAccountType('0xd018538C87232FF95acbCe4870629b75640a78E7'),
+ ).toBe('Imported');
});
it('should return MetaMask if address is not qr or simple', () => {
- expect(getAddressAccountType(mockHDKeyringAddress)).toBe('MetaMask');
+ expect(
+ getAddressAccountType('0x71C7656EC7ab88b098defB751B7401B5f6d8976F'),
+ ).toBe('MetaMask');
});
});
describe('resemblesAddress', () => {
@@ -362,6 +337,8 @@ describe('resemblesAddress', () => {
expect(resemblesAddress('address-stub-1')).toBeFalsy();
});
it('should return true if address resemble an eth address', () => {
- expect(resemblesAddress(mockHDKeyringAddress)).toBeTruthy();
+ expect(
+ resemblesAddress('0x71C7656EC7ab88b098defB751B7401B5f6d8976F'),
+ ).toBeTruthy();
});
});
diff --git a/app/util/address/index.ts b/app/util/address/index.ts
index 6d333d76f9e..5561b99d43d 100644
--- a/app/util/address/index.ts
+++ b/app/util/address/index.ts
@@ -34,15 +34,10 @@ import { store } from '../../store';
import { regex } from '../../../app/util/regex';
import Logger from '../../../app/util/Logger';
import { InternalAccount } from '@metamask/keyring-api';
-import { AddressBookControllerState } from '@metamask/address-book-controller';
+import { AddressBookState } from '@metamask/address-book-controller';
import { NetworkType, toChecksumHexAddress } from '@metamask/controller-utils';
import { NetworkClientId, NetworkState } from '@metamask/network-controller';
-import {
- AccountImportStrategy,
- ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
- KeyringTypes,
- ///: END:ONLY_INCLUDE_IF
-} from '@metamask/keyring-controller';
+import { AccountImportStrategy } from '@metamask/keyring-controller';
import { Hex, isHexString } from '@metamask/utils';
const {
@@ -249,10 +244,6 @@ export function getLabelTextByAddress(address: string) {
return 'accounts.qr_hardware';
case ExtendedKeyringTypes.simple:
return 'accounts.imported';
- ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
- case KeyringTypes.snap:
- return 'accounts.snap_account_tag';
- ///: END:ONLY_INCLUDE_IF
}
}
return null;
@@ -384,7 +375,7 @@ export function isValidHexAddress(
*/
function checkIfAddressAlreadySaved(
address: string,
- addressBook: AddressBookControllerState['addressBook'],
+ addressBook: AddressBookState['addressBook'],
chainId: Hex,
internalAccounts: InternalAccount[],
) {
@@ -429,7 +420,7 @@ function checkIfAddressAlreadySaved(
*/
export async function validateAddressOrENS(
toAccount: string,
- addressBook: AddressBookControllerState['addressBook'],
+ addressBook: AddressBookState['addressBook'],
internalAccounts: InternalAccount[],
chainId: Hex,
) {
diff --git a/app/util/browserScripts.ts b/app/util/browserScripts.js
similarity index 91%
rename from app/util/browserScripts.ts
rename to app/util/browserScripts.js
index ecd9d419915..c213a48f2d0 100644
--- a/app/util/browserScripts.ts
+++ b/app/util/browserScripts.js
@@ -76,10 +76,7 @@ export const JS_WINDOW_INFORMATION = `
export const JS_DESELECT_TEXT = `if (window.getSelection) {window.getSelection().removeAllRanges();}
else if (document.selection) {document.selection.empty();}`;
-export const JS_POST_MESSAGE_TO_PROVIDER = (
- message: object,
- origin: string
-) => `(function () {
+export const JS_POST_MESSAGE_TO_PROVIDER = (message, origin) => `(function () {
try {
window.postMessage(${JSON.stringify(message)}, '${origin}');
} catch (e) {
@@ -87,10 +84,7 @@ export const JS_POST_MESSAGE_TO_PROVIDER = (
}
})()`;
-export const JS_IFRAME_POST_MESSAGE_TO_PROVIDER = (
- _message: object,
- _origin: string
-) =>
+export const JS_IFRAME_POST_MESSAGE_TO_PROVIDER = (message, origin) =>
`(function () {})()`;
/** Disable sending messages to iframes for now
*
@@ -99,7 +93,7 @@ export const JS_IFRAME_POST_MESSAGE_TO_PROVIDER = (
for (let frame of iframes){
try {
- frame.contentWindow.postMessage(${JSON.stringify(_message)}, '${_origin}');
+ frame.contentWindow.postMessage(${JSON.stringify(message)}, '${origin}');
} catch (e) {
//Nothing to do
}
diff --git a/app/util/bytes.ts b/app/util/bytes.js
similarity index 72%
rename from app/util/bytes.ts
rename to app/util/bytes.js
index 3d046a30889..ac04d050c20 100644
--- a/app/util/bytes.ts
+++ b/app/util/bytes.js
@@ -5,10 +5,11 @@
*
* @returns - Hex string
*/
-export default function byteArrayToHex(value: Uint8Array): string {
+export default function byteArrayToHex(value) {
const HexCharacters = '0123456789abcdef';
const result = [];
- for (const v of value) {
+ for (let i = 0; i < value.length; i++) {
+ const v = value[i];
result.push(HexCharacters[(v & 0xf0) >> 4] + HexCharacters[v & 0x0f]);
}
return '0x' + result.join('');
diff --git a/app/util/checkAddress.test.ts b/app/util/checkAddress.test.ts
index 32a07f0dbba..4a253bf80c8 100644
--- a/app/util/checkAddress.test.ts
+++ b/app/util/checkAddress.test.ts
@@ -1,10 +1,10 @@
-import { AddressBookControllerState } from '@metamask/address-book-controller';
+import { AddressBookState } from '@metamask/address-book-controller';
import checkIfAddressIsSaved from './checkAddress';
describe('checkIfAddressIsSaved', () => {
it(`returns an empty array if the transaction recipient is unset`, () => {
const mockAddress = '0x0000000000000000000000000000000000000001';
- const addressBook: AddressBookControllerState['addressBook'] = {
+ const addressBook: AddressBookState['addressBook'] = {
'0x1': {
[mockAddress]: {
address: mockAddress,
@@ -26,7 +26,7 @@ describe('checkIfAddressIsSaved', () => {
// TODO: Update this case to return undefined to improve consistency
it('returns undefined if the address book is empty', () => {
const mockAddress = '0x0000000000000000000000000000000000000001';
- const addressBook: AddressBookControllerState['addressBook'] = {};
+ const addressBook: AddressBookState['addressBook'] = {};
const chainId = '0x1';
const transaction = {
to: mockAddress,
@@ -40,7 +40,7 @@ describe('checkIfAddressIsSaved', () => {
it('returns an empty array if transaction recipient is not in the address book', () => {
const mockAddress1 = '0x0000000000000000000000000000000000000001';
const mockAddress2 = '0x0000000000000000000000000000000000000002';
- const addressBook: AddressBookControllerState['addressBook'] = {
+ const addressBook: AddressBookState['addressBook'] = {
'0x1': {
[mockAddress2]: {
address: mockAddress2,
@@ -63,7 +63,7 @@ describe('checkIfAddressIsSaved', () => {
it('returns an empty array if transaction recipient is not in the address book for the given network', () => {
const mockAddress = '0x0000000000000000000000000000000000000001';
- const addressBook: AddressBookControllerState['addressBook'] = {
+ const addressBook: AddressBookState['addressBook'] = {
'0x2': {
[mockAddress]: {
address: mockAddress,
@@ -86,7 +86,7 @@ describe('checkIfAddressIsSaved', () => {
it('returns an address book entry', () => {
const mockAddress = '0x0000000000000000000000000000000000000001';
- const addressBook: AddressBookControllerState['addressBook'] = {
+ const addressBook: AddressBookState['addressBook'] = {
'0x1': {
[mockAddress]: {
address: mockAddress,
@@ -115,7 +115,7 @@ describe('checkIfAddressIsSaved', () => {
it('returns an address book entry with a checksummed address', () => {
const mockAddress = '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa';
const mockAddressChecksummed = '0xaAaAaAaaAaAaAaaAaAAAAAAAAaaaAaAaAaaAaaAa';
- const addressBook: AddressBookControllerState['addressBook'] = {
+ const addressBook: AddressBookState['addressBook'] = {
'0x1': {
[mockAddress]: {
address: mockAddress,
@@ -145,7 +145,7 @@ describe('checkIfAddressIsSaved', () => {
it('returns multiple address book entries', () => {
const mockAddress = '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa';
const mockAddressChecksummed = '0xaAaAaAaaAaAaAaaAaAAAAAAAAaaaAaAaAaaAaaAa';
- const addressBook: AddressBookControllerState['addressBook'] = {
+ const addressBook: AddressBookState['addressBook'] = {
'0x1': {
[mockAddress]: {
address: mockAddress,
diff --git a/app/util/checkAddress.ts b/app/util/checkAddress.ts
index 74c1d994a58..097d49a5041 100644
--- a/app/util/checkAddress.ts
+++ b/app/util/checkAddress.ts
@@ -1,4 +1,4 @@
-import type { AddressBookControllerState } from '@metamask/address-book-controller';
+import type { AddressBookState } from '@metamask/address-book-controller';
import { toChecksumAddress } from 'ethereumjs-util';
/**
@@ -12,7 +12,7 @@ import { toChecksumAddress } from 'ethereumjs-util';
* transaction recipient.
*/
const checkIfAddressIsSaved = (
- addressBook: AddressBookControllerState['addressBook'],
+ addressBook: AddressBookState['addressBook'],
chainId: string,
// TODO: Replace "any" with type
// eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/app/util/date/index.js b/app/util/date/index.js
index d8292ebf03b..0035c6a2a9b 100644
--- a/app/util/date/index.js
+++ b/app/util/date/index.js
@@ -1,5 +1,4 @@
import { strings } from '../../../locales/i18n';
-import { MINUTE, HOUR, DAY } from '../../constants/time';
export function toLocaleDateTime(timestamp) {
const dateObj = new Date(timestamp);
@@ -62,27 +61,3 @@ export const formatTimestampToYYYYMMDD = (timestamp) => {
const day = String(date.getDate()).padStart(2, '0');
return `${year}-${month}-${day}`;
};
-
-/**
- * Returns an object containing the difference in days, hours, and minutes between a now and a future timestamp.
- *
- * @param {number} timestamp - The timestamp in the future to compare to now.
- *
- * @returns object with difference in amount of days, hours, and minutes. If timestamp is in the past, a default value of { days: 0, hours: 0, minutes: 0 } is returned.
- */
-export const getTimeDifferenceFromNow = (timestamp) => {
- const currentTime = Date.now();
-
- // Default when timestamp is in the past.
- if (timestamp < currentTime) {
- return { days: 0, hours: 0, minutes: 0 };
- }
-
- const differenceInMilliseconds = timestamp - currentTime;
-
- const days = Math.floor(differenceInMilliseconds / DAY);
- const hours = Math.floor((differenceInMilliseconds % DAY) / HOUR);
- const minutes = Math.floor((differenceInMilliseconds % HOUR) / MINUTE);
-
- return { days, hours, minutes };
-};
diff --git a/app/util/date/index.test.ts b/app/util/date/index.test.ts
index a71879af94b..80e8cf1f27b 100644
--- a/app/util/date/index.test.ts
+++ b/app/util/date/index.test.ts
@@ -3,7 +3,6 @@ import {
msToHours,
toDateFormat,
formatTimestampToYYYYMMDD,
- getTimeDifferenceFromNow,
} from '.';
const TZ = 'America/Toronto';
@@ -75,58 +74,3 @@ describe('Date util :: formatTimestampToYYYYMMDD', () => {
expect(formatTimestampToYYYYMMDD(date)).toEqual('2024-07-31');
});
});
-
-describe('Date util :: getDaysAndHoursRemaining', () => {
- // 2024-09-24 19:19:41
- const MOCK_NOW = 1727205581107;
-
- const mockDateNow = jest.spyOn(Date, 'now');
-
- beforeEach(() => {
- jest.clearAllMocks();
- });
-
- afterAll(() => {
- jest.spyOn(Date, 'now').mockRestore();
- });
-
- it('returns time difference between timestamp and now', () => {
- mockDateNow.mockImplementation(() => MOCK_NOW);
-
- // 2024-09-29 23:54:41 (5 days, 4 hours, and 35 minutes after MOCK_NOW)
- const TIMESTAMP = 1727654081107;
-
- const { days, hours, minutes } = getTimeDifferenceFromNow(
- Number(TIMESTAMP),
- );
-
- expect(days).toBe(5);
- expect(hours).toBe(4);
- expect(minutes).toBe(35);
- });
-
- it('returns correct value when timestamp and current time are identical', () => {
- mockDateNow.mockImplementation(() => MOCK_NOW);
-
- const { days, hours, minutes } = getTimeDifferenceFromNow(Number(MOCK_NOW));
-
- expect(days).toBe(0);
- expect(hours).toBe(0);
- expect(minutes).toBe(0);
- });
-
- it('returns default value when timestamp passed in is in the past', () => {
- // 2024-09-21 19:19:41 (3 days before MOCK_NOW)
- const TIMESTAMP = 1726946381107;
-
- mockDateNow.mockImplementation(() => MOCK_NOW);
-
- const { days, hours, minutes } = getTimeDifferenceFromNow(
- Number(TIMESTAMP),
- );
-
- expect(days).toBe(0);
- expect(hours).toBe(0);
- expect(minutes).toBe(0);
- });
-});
diff --git a/app/util/metrics/TrackOnboarding/trackOnboarding.ts b/app/util/metrics/TrackOnboarding/trackOnboarding.ts
index 03df7ec95de..38b2d2920ed 100644
--- a/app/util/metrics/TrackOnboarding/trackOnboarding.ts
+++ b/app/util/metrics/TrackOnboarding/trackOnboarding.ts
@@ -11,7 +11,10 @@ import { JsonMap } from '@segment/analytics-react-native';
const trackOnboarding = (
event: IMetaMetricsEvent,
properties: JsonMap = {},
- saveOnboardingEvent?: (...args: [IMetaMetricsEvent]) => void
+ saveOnboardingEvent?: (event: IMetaMetricsEvent) => {
+ event: IMetaMetricsEvent;
+ type: string;
+ },
): void => {
InteractionManager.runAfterInteractions(async () => {
const metrics = MetaMetrics.getInstance();
diff --git a/app/util/networks/index.js b/app/util/networks/index.js
index 0339830ef04..6838b0bf2cb 100644
--- a/app/util/networks/index.js
+++ b/app/util/networks/index.js
@@ -579,5 +579,5 @@ export const deprecatedGetNetworkId = async () => {
});
};
-export const isMultichainVersion1Enabled =
+export const isMutichainVersion1Enabled =
process.env.MM_MULTICHAIN_V1_ENABLED === '1';
diff --git a/app/util/notifications/androidChannels.test.ts b/app/util/notifications/androidChannels.test.ts
deleted file mode 100644
index c0cb6a45412..00000000000
--- a/app/util/notifications/androidChannels.test.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { AndroidImportance } from '@notifee/react-native';
-import {
- ChannelId,
- MetaMaskAndroidChannel,
- notificationChannels,
-} from './androidChannels';
-
-describe('notificationChannels', () => {
- it('should have two channels', () => {
- expect(notificationChannels).toHaveLength(2);
- });
-
- it('should have the correct properties for the first channel', () => {
- const firstChannel: MetaMaskAndroidChannel = notificationChannels[0];
- expect(firstChannel).toEqual({
- id: ChannelId.DEFAULT_NOTIFICATION_CHANNEL_ID,
- name: 'Transaction Complete',
- lights: false,
- vibration: false,
- importance: AndroidImportance.DEFAULT,
- title: 'Transaction',
- subtitle: 'Transaction Complete',
- });
- });
-
- it('should have the correct properties for the second channel', () => {
- const secondChannel: MetaMaskAndroidChannel = notificationChannels[1];
- expect(secondChannel).toEqual({
- id: ChannelId.ANNOUNCEMENT_NOTIFICATION_CHANNEL_ID,
- name: 'MetaMask Announcement',
- lights: false,
- vibration: false,
- importance: AndroidImportance.DEFAULT,
- title: 'Announcement',
- subtitle: 'MetaMask Announcement',
- });
- });
-
- it('should have unique titles for each channel', () => {
- const titles = notificationChannels.map((channel) => channel.title);
- const uniqueTitles = new Set(titles);
- expect(uniqueTitles.size).toBe(titles.length);
- });
-
- it('should have unique subtitles for each channel', () => {
- const subtitles = notificationChannels.map((channel) => channel.subtitle);
- const uniqueSubtitles = new Set(subtitles);
- expect(uniqueSubtitles.size).toBe(subtitles.length);
- });
-});
diff --git a/app/util/notifications/androidChannels.ts b/app/util/notifications/androidChannels.ts
deleted file mode 100644
index 4841cb7e1a5..00000000000
--- a/app/util/notifications/androidChannels.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { AndroidChannel, AndroidImportance } from '@notifee/react-native';
-
-export enum ChannelId {
- DEFAULT_NOTIFICATION_CHANNEL_ID = 'DEFAULT_NOTIFICATION_CHANNEL_ID',
- ANNOUNCEMENT_NOTIFICATION_CHANNEL_ID = 'ANNOUNCEMENT_NOTIFICATION_CHANNEL_ID',
-}
-
-export interface MetaMaskAndroidChannel extends AndroidChannel {
- id: ChannelId;
- title: string;
- subtitle: string;
-}
-
-export const notificationChannels = [
- {
- id: ChannelId.DEFAULT_NOTIFICATION_CHANNEL_ID,
- name: 'Transaction Complete',
- lights: false,
- vibration: false,
- importance: AndroidImportance.DEFAULT,
- title: 'Transaction',
- subtitle: 'Transaction Complete',
- } as MetaMaskAndroidChannel,
- {
- id: ChannelId.ANNOUNCEMENT_NOTIFICATION_CHANNEL_ID,
- name: 'MetaMask Announcement',
- lights: false,
- vibration: false,
- importance: AndroidImportance.DEFAULT,
- title: 'Announcement',
- subtitle: 'MetaMask Announcement',
- } as MetaMaskAndroidChannel,
-];
diff --git a/app/util/notifications/hooks/index.test.ts b/app/util/notifications/hooks/index.test.ts
index bbe94a97dc3..c826067a63a 100644
--- a/app/util/notifications/hooks/index.test.ts
+++ b/app/util/notifications/hooks/index.test.ts
@@ -6,9 +6,6 @@ import notifee, {
import useNotificationHandler from './index';
import { NavigationProp, ParamListBase } from '@react-navigation/native';
-import Routes from '../../../constants/navigation/Routes';
-import { Notification } from '../../../util/notifications/types';
-import { TRIGGER_TYPES } from '../constants';
jest.mock('../../../util/device');
jest.mock('../../../core/NotificationManager', () => ({
@@ -29,67 +26,51 @@ jest.mock('@notifee/react-native', () => ({
},
}));
-jest.mock('../../../core/NotificationManager', () => ({
- setTransactionToView: jest.fn(),
-}));
-
-jest.mock('../../../util/device', () => ({
- isAndroid: jest.fn(),
-}));
-
const mockNavigate = jest.fn();
const mockNavigation = {
navigate: mockNavigate,
} as unknown as NavigationProp;
-const notification = {
- id: 1,
- type: TRIGGER_TYPES.ERC1155_RECEIVED,
- data: {
- id: 1,
- trigger_id: '1',
- chain_id: 1,
- block_number: 1,
- block_timestamp: '',
- tx_hash: '',
- unread: false,
- created_at: '',
- address: '',
- type: TRIGGER_TYPES.ERC1155_RECEIVED,
- data: {},
- createdAt: '',
- isRead: false,
- },
-} as unknown as Notification;
+const bootstrapAndroidInitialNotification = jest
+ .fn()
+ .mockResolvedValue(undefined);
const mockNotificationEvent = (event: NotifeeEvent) => ({
type: event.type,
detail: {
- notification,
+ notification: {
+ body: 'notificationTest',
+ data: {
+ action: 'tx',
+ id: '123',
+ },
+ },
},
});
-
describe('useNotificationHandler', () => {
beforeEach(() => {
jest.clearAllMocks();
});
- it('should navigate to NOTIFICATIONS.DETAILS if notification is pressed', async () => {
- const { result } = renderHook(() => useNotificationHandler(mockNavigation));
+ it('sets initial badge count and initializes Android notifications on mount', async () => {
+ renderHook(() =>
+ useNotificationHandler(
+ bootstrapAndroidInitialNotification,
+ mockNavigation,
+ ),
+ );
- await result.current.handlePressedNotification(notification);
+ expect(bootstrapAndroidInitialNotification).toHaveBeenCalled();
- expect(mockNavigation.navigate).toHaveBeenCalledWith(
- Routes.NOTIFICATIONS.DETAILS,
- {
- notificationId: notification.id,
- },
- );
+ jest.runAllTimers();
});
it('should handle notifications correctly', async () => {
const { waitFor } = renderHook(() =>
- useNotificationHandler(mockNavigation),
+ useNotificationHandler(
+ bootstrapAndroidInitialNotification,
+ mockNavigation,
+ ),
);
await act(async () => {
@@ -115,7 +96,10 @@ describe('useNotificationHandler', () => {
it('should do nothing if the EventType is DISMISSED', async () => {
const { waitFor } = renderHook(() =>
- useNotificationHandler(mockNavigation),
+ useNotificationHandler(
+ bootstrapAndroidInitialNotification,
+ mockNavigation,
+ ),
);
await act(async () => {
@@ -142,7 +126,10 @@ describe('useNotificationHandler', () => {
it('should do nothing if data.action is not tx', async () => {
const { waitFor } = renderHook(() =>
- useNotificationHandler(mockNavigation),
+ useNotificationHandler(
+ bootstrapAndroidInitialNotification,
+ mockNavigation,
+ ),
);
await act(async () => {
@@ -171,7 +158,10 @@ describe('useNotificationHandler', () => {
it('handleOpenedNotification should do nothing if notification is null', async () => {
const { waitFor } = renderHook(() =>
- useNotificationHandler(mockNavigation),
+ useNotificationHandler(
+ bootstrapAndroidInitialNotification,
+ mockNavigation,
+ ),
);
await act(async () => {
@@ -193,7 +183,10 @@ describe('useNotificationHandler', () => {
it('should navigate to the transaction view when the notification action is "tx"', async () => {
const { waitFor } = renderHook(() =>
- useNotificationHandler(mockNavigation),
+ useNotificationHandler(
+ bootstrapAndroidInitialNotification,
+ mockNavigation,
+ ),
);
await act(async () => {
@@ -223,7 +216,10 @@ describe('useNotificationHandler', () => {
}));
const { waitFor } = renderHook(() =>
- useNotificationHandler(mockNavigation),
+ useNotificationHandler(
+ bootstrapAndroidInitialNotification,
+ mockNavigation,
+ ),
);
await act(async () => {
diff --git a/app/util/notifications/hooks/index.ts b/app/util/notifications/hooks/index.ts
index e91fe593eaf..796d8c3b19f 100644
--- a/app/util/notifications/hooks/index.ts
+++ b/app/util/notifications/hooks/index.ts
@@ -1,33 +1,39 @@
import { useCallback, useEffect } from 'react';
-import { NavigationProp, ParamListBase } from '@react-navigation/native';
-import NotificationsService from '../../../util/notifications/services/NotificationService';
+import notifee, {
+ Event as NotifeeEvent,
+ EventType,
+} from '@notifee/react-native';
+import NotificationManager from '../../../core/NotificationManager';
import Routes from '../../../constants/navigation/Routes';
-import {
- isNotificationsFeatureEnabled,
- TRIGGER_TYPES,
-} from '../../../util/notifications';
-import { Notification } from '../../../util/notifications/types';
-import { Linking } from 'react-native';
+import { setupAndroidChannel } from '../setupAndroidChannels';
+import { SimpleNotification } from '../types';
+import Device from '../../../util/device';
+import { NavigationProp, ParamListBase } from '@react-navigation/native';
-const useNotificationHandler = (navigation: NavigationProp) => {
+const useNotificationHandler = (
+ bootstrapAndroidInitialNotification: () => Promise,
+ navigation: NavigationProp,
+) => {
const performActionBasedOnOpenedNotificationType = useCallback(
- async (notification: Notification) => {
- if (
- notification.type === TRIGGER_TYPES.FEATURES_ANNOUNCEMENT &&
- notification.data.externalLink
- ) {
- Linking.openURL(notification.data.externalLink.externalLinkUrl);
+ async (notification: SimpleNotification) => {
+ const { data } = notification;
+
+ if (data && data.action === 'tx') {
+ if (data.id) {
+ NotificationManager.setTransactionToView(data.id);
+ }
+ if (navigation) {
+ navigation.navigate(Routes.TRANSACTIONS_VIEW);
+ }
} else {
- navigation.navigate(Routes.NOTIFICATIONS.DETAILS, {
- notificationId: notification.id,
- });
+ navigation.navigate(Routes.NOTIFICATIONS.VIEW);
}
},
[navigation],
);
- const handlePressedNotification = useCallback(
- (notification?: Notification) => {
+ const handleOpenedNotification = useCallback(
+ (notification?: SimpleNotification) => {
if (!notification) {
return;
}
@@ -36,36 +42,28 @@ const useNotificationHandler = (navigation: NavigationProp) => {
[performActionBasedOnOpenedNotificationType],
);
- useEffect(() => {
- if (!isNotificationsFeatureEnabled()) return;
-
- const unsubscribeForegroundEvent = NotificationsService.onForegroundEvent(
- async ({ type, detail }) =>
- await NotificationsService.handleNotificationEvent({
- type,
- detail,
- callback: handlePressedNotification,
- }),
- );
-
- NotificationsService.onBackgroundEvent(
- async ({ type, detail }) =>
- await NotificationsService.handleNotificationEvent({
- type,
- detail,
- callback: handlePressedNotification,
- }),
- );
-
- return () => {
- unsubscribeForegroundEvent();
- };
- }, [handlePressedNotification]);
+ const handleNotificationPressed = useCallback(
+ (event: NotifeeEvent) => {
+ if (event.type === EventType.PRESS) {
+ handleOpenedNotification(event.detail.notification);
+ }
+ },
+ [handleOpenedNotification],
+ );
- return {
- performActionBasedOnOpenedNotificationType,
- handlePressedNotification,
- };
+ useEffect(() => {
+ bootstrapAndroidInitialNotification();
+ setTimeout(() => {
+ if (Device.isAndroid()) {
+ setupAndroidChannel();
+ }
+ notifee.onForegroundEvent(handleNotificationPressed);
+ }, 1000);
+ }, [
+ bootstrapAndroidInitialNotification,
+ navigation,
+ handleNotificationPressed,
+ ]);
};
export default useNotificationHandler;
diff --git a/app/util/notifications/index.ts b/app/util/notifications/index.ts
index d1e6201e1e9..ec78eb1f67a 100644
--- a/app/util/notifications/index.ts
+++ b/app/util/notifications/index.ts
@@ -1,7 +1,7 @@
export * from './types';
export * from './constants';
-export * from './androidChannels';
+export * from './setupAndroidChannels';
export * from './settings';
export * from './hooks';
export * from './methods';
-export * from './services';
+export * from './pushPermissions';
diff --git a/app/util/notifications/methods/common.ts b/app/util/notifications/methods/common.ts
index 171d150f517..c80bc3fdb80 100644
--- a/app/util/notifications/methods/common.ts
+++ b/app/util/notifications/methods/common.ts
@@ -2,7 +2,6 @@ import dayjs, { Dayjs } from 'dayjs';
import isYesterday from 'dayjs/plugin/isYesterday';
import relativeTime from 'dayjs/plugin/relativeTime';
-import notifee from '@notifee/react-native';
import localeData from 'dayjs/plugin/localeData';
import { Web3Provider } from '@ethersproject/providers';
import { toHex } from '@metamask/controller-utils';
@@ -471,13 +470,3 @@ export const getUsdAmount = (amount: string, decimals: string, usd: string) => {
return formatAmount(numericAmount);
};
-
-export const hasInitialNotification = async () =>
- Boolean(await notifee.getInitialNotification());
-
-export function withTimeout(promise: Promise, ms: number): Promise {
- const timeout = new Promise((_, reject) =>
- setTimeout(() => reject(new Error(strings('notifications.timeout'))), ms),
- );
- return Promise.race([promise, timeout]);
-}
diff --git a/app/util/notifications/pushPermissions.test.ts b/app/util/notifications/pushPermissions.test.ts
new file mode 100644
index 00000000000..b9f80882f2f
--- /dev/null
+++ b/app/util/notifications/pushPermissions.test.ts
@@ -0,0 +1,113 @@
+import notifee, {
+ NotificationSettings,
+ AuthorizationStatus,
+ IOSNotificationSetting,
+ IOSNotificationSettings,
+ AndroidNotificationSettings,
+ AndroidNotificationSetting,
+} from '@notifee/react-native';
+
+import { strings } from '../../../locales/i18n';
+import { requestPushNotificationsPermission } from './pushPermissions';
+
+jest.mock('@notifee/react-native', () => ({
+ getNotificationSettings: jest.fn(),
+ AuthorizationStatus: {
+ AUTHORIZED: 1,
+ DENIED: 2,
+ },
+ IOSNotificationSetting: {
+ ENABLED: 1,
+ DISABLED: 2,
+ },
+ AndroidNotificationSetting: {
+ ENABLED: 1,
+ DISABLED: 2,
+ },
+}));
+
+jest.mock('../Logger', () => ({
+ error: jest.fn(),
+}));
+
+jest.mock('../../../locales/i18n', () => ({
+ strings: jest.fn(),
+}));
+
+jest.mock('./pushPermissions', () => ({
+ ...jest.requireActual('./pushPermissions'),
+ AsyncAlert: jest.fn(),
+}));
+
+describe('requestPushNotificationsPermission', () => {
+ afterEach(() => {
+ jest.clearAllMocks();
+ });
+
+ const mockIOSSettings: IOSNotificationSettings = {
+ authorizationStatus: AuthorizationStatus.AUTHORIZED,
+ alert: IOSNotificationSetting.ENABLED,
+ badge: IOSNotificationSetting.ENABLED,
+ sound: IOSNotificationSetting.ENABLED,
+ carPlay: IOSNotificationSetting.DISABLED,
+ criticalAlert: IOSNotificationSetting.DISABLED,
+ inAppNotificationSettings: IOSNotificationSetting.DISABLED,
+ lockScreen: IOSNotificationSetting.ENABLED,
+ notificationCenter: IOSNotificationSetting.ENABLED,
+ showPreviews: 1,
+ announcement: 1,
+ };
+
+ const mockAndroidSettings: AndroidNotificationSettings = {
+ alarm: AndroidNotificationSetting.ENABLED,
+ };
+
+ it('should return notification settings if already authorized', async () => {
+ const mockSettings: NotificationSettings = {
+ authorizationStatus: AuthorizationStatus.AUTHORIZED,
+ ios: mockIOSSettings,
+ android: mockAndroidSettings,
+ web: {},
+ };
+
+ (notifee.getNotificationSettings as jest.Mock).mockResolvedValue(
+ mockSettings,
+ );
+
+ const result = await requestPushNotificationsPermission();
+
+ expect(notifee.getNotificationSettings).toHaveBeenCalledTimes(1);
+ expect(result).toBe(mockSettings);
+ });
+
+ it('should prompt the user with AsyncAlert and simulate a click', async () => {
+ const mockSettings: NotificationSettings = {
+ authorizationStatus: AuthorizationStatus.DENIED,
+ ios: mockIOSSettings,
+ android: mockAndroidSettings,
+ web: {},
+ };
+
+ const updatedSettings: NotificationSettings = {
+ ...mockSettings,
+ authorizationStatus: AuthorizationStatus.AUTHORIZED,
+ };
+
+ (notifee.getNotificationSettings as jest.Mock)
+ .mockResolvedValueOnce(mockSettings)
+ .mockResolvedValueOnce(updatedSettings);
+ (strings as jest.Mock).mockImplementation((key: string) => key);
+
+ const mockAsyncAlert = jest.fn().mockResolvedValue(true);
+
+ await requestPushNotificationsPermission(mockAsyncAlert);
+
+ expect(mockAsyncAlert).toHaveBeenCalledWith(
+ 'notifications.prompt_title',
+ 'notifications.prompt_desc',
+ );
+ expect(notifee.getNotificationSettings).toHaveBeenCalledTimes(1);
+ expect(strings).toHaveBeenCalledWith('notifications.prompt_title');
+ expect(strings).toHaveBeenCalledWith('notifications.prompt_desc');
+ });
+});
diff --git a/app/util/notifications/pushPermissions.ts b/app/util/notifications/pushPermissions.ts
new file mode 100644
index 00000000000..6610803e1b5
--- /dev/null
+++ b/app/util/notifications/pushPermissions.ts
@@ -0,0 +1,123 @@
+import notifee, {
+ AuthorizationStatus,
+ NotificationSettings,
+} from '@notifee/react-native';
+import { Linking, Alert as NativeAlert, Platform } from 'react-native';
+import { strings } from '../../../locales/i18n';
+import { mmStorage } from './settings';
+import { STORAGE_IDS } from './settings/storage/constants';
+import Logger from '../Logger';
+import Device from '../device';
+import { store } from '../../store';
+
+interface AlertButton {
+ text: string;
+ onPress: () => void | Promise;
+}
+
+export const openSystemSettings = () => {
+ if (Platform.OS === 'ios') {
+ Linking.openSettings();
+ } else {
+ notifee.openNotificationSettings();
+ }
+};
+
+export const isDeviceNotificationEnabled = async () => {
+ const settings = await notifee.getNotificationSettings();
+ switch (settings.authorizationStatus) {
+ case AuthorizationStatus.AUTHORIZED:
+ case AuthorizationStatus.PROVISIONAL:
+ store.dispatch({
+ type: 'TOGGLE_DEVICE_NOTIFICATIONS',
+ deviceNotificationEnabled: true,
+ });
+ return true;
+ default:
+ store.dispatch({
+ type: 'TOGGLE_DEVICE_NOTIFICATIONS',
+ deviceNotificationEnabled: false,
+ });
+ return false;
+ }
+};
+
+const defaultButtons = (resolve: (value: boolean) => void): AlertButton[] => [
+ {
+ text: strings('notifications.prompt_cancel'),
+ onPress: () => {
+ const promptCount = mmStorage.getLocal(
+ STORAGE_IDS.PUSH_NOTIFICATIONS_PROMPT_COUNT,
+ );
+ mmStorage.saveLocal(
+ STORAGE_IDS.PUSH_NOTIFICATIONS_PROMPT_COUNT,
+ promptCount + 1,
+ );
+ mmStorage.saveLocal(
+ STORAGE_IDS.PUSH_NOTIFICATIONS_PROMPT_TIME,
+ Date.now().toString(),
+ );
+
+ resolve(false);
+ },
+ },
+ {
+ text: strings('notifications.prompt_ok'),
+ onPress: async () => {
+ openSystemSettings();
+ resolve(true);
+ },
+ },
+];
+
+export const asyncAlert = (
+ title: string,
+ msg: string,
+ getButtons: (
+ resolve: (value: boolean) => void,
+ ) => AlertButton[] = defaultButtons,
+): Promise =>
+ new Promise((resolve) => {
+ NativeAlert.alert(title, msg, getButtons(resolve), {
+ cancelable: false,
+ });
+ });
+
+export const requestPushNotificationsPermission = async (
+ alertFunction: typeof asyncAlert = asyncAlert,
+): Promise => {
+ let permissionStatus: NotificationSettings | undefined;
+ permissionStatus = await notifee.getNotificationSettings();
+ if (
+ permissionStatus.authorizationStatus === AuthorizationStatus.AUTHORIZED ||
+ permissionStatus.authorizationStatus === AuthorizationStatus.PROVISIONAL
+ ) {
+ return permissionStatus;
+ }
+ try {
+ await alertFunction(
+ strings('notifications.prompt_title'),
+ strings('notifications.prompt_desc'),
+ );
+
+ if (Device.isIos()) {
+ permissionStatus = await notifee.requestPermission({
+ provisional: true,
+ });
+ } else {
+ permissionStatus = await notifee.requestPermission();
+ }
+
+ return permissionStatus;
+ } catch (e) {
+ if (e instanceof Error) {
+ Logger.error(e, strings('notifications.error_checking_permission'));
+ } else {
+ Logger.error(
+ new Error(strings('notifications.error_checking_permission')),
+ );
+ }
+ }
+};
+
+export default requestPushNotificationsPermission;
diff --git a/app/util/notifications/services/NotificationService.test.ts b/app/util/notifications/services/NotificationService.test.ts
deleted file mode 100644
index e40e78dd47e..00000000000
--- a/app/util/notifications/services/NotificationService.test.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-import notifee, {
- AuthorizationStatus,
- AndroidChannel,
- AndroidImportance,
- EventType,
-} from '@notifee/react-native';
-import { Linking } from 'react-native';
-import { ChannelId } from '../../../util/notifications/androidChannels';
-import NotificationsService from './NotificationService';
-
-jest.mock('@notifee/react-native');
-jest.mock('react-native', () => ({
- Linking: { openSettings: jest.fn() },
- Platform: { OS: 'ios' },
- Alert: { alert: jest.fn() },
-}));
-jest.mock('../settings', () => ({
- mmStorage: {
- getLocal: jest.fn(),
- saveLocal: jest.fn(),
- },
-}));
-jest.mock('../../../store', () => ({
- store: {
- dispatch: jest.fn(),
- },
-}));
-jest.mock('../../../util/Logger', () => ({
- error: jest.fn(),
-}));
-
-describe('NotificationsService', () => {
- beforeEach(() => {
- jest.clearAllMocks();
- });
-
- it('should get blocked notifications', async () => {
- (notifee.getNotificationSettings as jest.Mock).mockResolvedValue({
- authorizationStatus: AuthorizationStatus.AUTHORIZED,
- });
- (notifee.getChannels as jest.Mock).mockResolvedValue([
- { id: ChannelId.DEFAULT_NOTIFICATION_CHANNEL_ID, blocked: true },
- ]);
-
- const blockedNotifications =
- await NotificationsService.getBlockedNotifications();
-
- expect(
- blockedNotifications.get(ChannelId.DEFAULT_NOTIFICATION_CHANNEL_ID),
- ).toBe(true);
- });
-
- it('should handle notification press', async () => {
- const detail = {
- notification: {
- id: 'test-id',
- data: { url: 'https://example.com' },
- },
- };
- const callback = jest.fn();
-
- await NotificationsService.handleNotificationPress({ detail, callback });
-
- expect(notifee.cancelTriggerNotification).toHaveBeenCalledWith('test-id');
- expect(callback).toHaveBeenCalledWith(detail.notification);
- });
-
- it('should open system settings on iOS', () => {
- NotificationsService.openSystemSettings();
-
- expect(Linking.openSettings).toHaveBeenCalled();
- });
-
- it('should create notification channels', async () => {
- const channel: AndroidChannel = {
- id: ChannelId.DEFAULT_NOTIFICATION_CHANNEL_ID,
- name: 'Test Channel',
- importance: AndroidImportance.HIGH,
- };
-
- await NotificationsService.createChannel(channel);
-
- expect(notifee.createChannel).toHaveBeenCalledWith(channel);
- });
-
- it.concurrent(
- 'should return authorized from getAllPermissions',
- async () => {
- const result = await NotificationsService.getAllPermissions();
- expect(result.permission).toBe('authorized');
- },
- 10000,
- );
-
- it('should return authorized from requestPermission ', async () => {
- const result = await NotificationsService.requestPermission();
- expect(result).toBe('authorized');
- });
-
- it('should return denied from requestPermission', async () => {
- (notifee.requestPermission as jest.Mock).mockResolvedValue({
- authorizationStatus: AuthorizationStatus.DENIED,
- });
- const result = await NotificationsService.requestPermission();
- expect(result).toBe('denied');
- });
-
- it('should handle notification event', async () => {
- const callback = jest.fn();
-
- await NotificationsService.handleNotificationEvent({
- type: EventType.DELIVERED,
- detail: {
- notification: {
- id: '123',
- },
- },
- callback,
- });
-
- expect(NotificationsService.incrementBadgeCount).toBeInstanceOf(Function);
-
- await NotificationsService.handleNotificationEvent({
- type: EventType.PRESS,
- detail: {
- notification: {
- id: '123',
- },
- },
- callback,
- });
-
- expect(NotificationsService.decrementBadgeCount).toBeInstanceOf(Function);
- expect(NotificationsService.cancelTriggerNotification).toBeInstanceOf(
- Function,
- );
- });
-});
diff --git a/app/util/notifications/services/NotificationService.ts b/app/util/notifications/services/NotificationService.ts
deleted file mode 100644
index 6c6f104404f..00000000000
--- a/app/util/notifications/services/NotificationService.ts
+++ /dev/null
@@ -1,234 +0,0 @@
-import notifee, {
- AuthorizationStatus,
- Event as NotifeeEvent,
- EventType,
- EventDetail,
- AndroidChannel,
-} from '@notifee/react-native';
-
-import { Notification } from '../types';
-
-import { Linking, Platform, Alert as NativeAlert } from 'react-native';
-import {
- ChannelId,
- notificationChannels,
-} from '../../../util/notifications/androidChannels';
-
-import { strings } from '../../../../locales/i18n';
-import { mmStorage } from '../settings';
-import { STORAGE_IDS } from '../settings/storage/constants';
-import { store } from '../../../store';
-import Logger from '../../../util/Logger';
-import { withTimeout } from '../methods';
-
-interface AlertButton {
- text: string;
- onPress: () => void | Promise;
-}
-
-class NotificationsService {
- async getBlockedNotifications(): Promise> {
- try {
- const settings = await notifee.getNotificationSettings();
- const channels = await notifee.getChannels();
-
- switch (settings.authorizationStatus) {
- case AuthorizationStatus.NOT_DETERMINED:
- case AuthorizationStatus.DENIED:
- return notificationChannels.reduce((map, next) => {
- map.set(next.id as ChannelId, true);
- return map;
- }, new Map());
- }
-
- return channels.reduce((map, next) => {
- if (next.blocked) {
- map.set(next.id as ChannelId, true);
- }
- return map;
- }, new Map());
- } catch (e) {
- Logger.error(
- e as Error,
- strings('notifications.error_checking_permission'),
- );
- return new Map();
- }
- }
-
- async getAllPermissions(shouldOpenSettings = true) {
- const promises: Promise[] = notificationChannels.map(
- (channel: AndroidChannel) =>
- withTimeout(this.createChannel(channel), 5000),
- );
- await Promise.allSettled(promises);
- const permission = await withTimeout(this.requestPermission(), 5000);
- const blockedNotifications = await withTimeout(
- this.getBlockedNotifications(),
- 5000,
- );
- if (
- (permission !== 'authorized' || blockedNotifications.size !== 0) &&
- shouldOpenSettings
- ) {
- await this.requestPushNotificationsPermission();
- }
- return { permission, blockedNotifications };
- }
-
- async isDeviceNotificationEnabled() {
- const permission = await notifee.getNotificationSettings();
-
- const isAuthorized =
- permission.authorizationStatus === AuthorizationStatus.AUTHORIZED;
-
- store.dispatch({
- type: 'TOGGLE_DEVICE_NOTIFICATIONS',
- deviceNotificationEnabled: isAuthorized,
- });
- return isAuthorized;
- }
-
- defaultButtons = (resolve: (value: boolean) => void): AlertButton[] => [
- {
- text: strings('notifications.prompt_cancel'),
- onPress: () => {
- const promptCount = mmStorage.getLocal(
- STORAGE_IDS.PUSH_NOTIFICATIONS_PROMPT_COUNT,
- );
- mmStorage.saveLocal(
- STORAGE_IDS.PUSH_NOTIFICATIONS_PROMPT_COUNT,
- promptCount + 1,
- );
- mmStorage.saveLocal(
- STORAGE_IDS.PUSH_NOTIFICATIONS_PROMPT_TIME,
- Date.now().toString(),
- );
-
- resolve(false);
- },
- },
- {
- text: strings('notifications.prompt_ok'),
- onPress: async () => {
- this.openSystemSettings();
- resolve(true);
- },
- },
- ];
-
- asyncAlert = (
- title: string,
- msg: string,
- getButtons: (resolve: (value: boolean) => void) => AlertButton[] = this
- .defaultButtons,
- ): Promise =>
- new Promise((resolve) => {
- NativeAlert.alert(title, msg, getButtons(resolve), {
- cancelable: false,
- });
- });
-
- async requestPushNotificationsPermission(): Promise {
- try {
- await this.asyncAlert(
- strings('notifications.prompt_title'),
- strings('notifications.prompt_desc'),
- );
- } catch (e) {
- Logger.error(
- e as Error,
- strings('notifications.error_checking_permission'),
- );
- }
- }
- openSystemSettings() {
- if (Platform.OS === 'ios') {
- Linking.openSettings();
- } else {
- notifee.openNotificationSettings();
- }
- }
-
- async requestPermission() {
- const settings = await notifee.requestPermission();
- return settings.authorizationStatus === AuthorizationStatus.AUTHORIZED ||
- settings.authorizationStatus === AuthorizationStatus.PROVISIONAL
- ? 'authorized'
- : 'denied';
- }
-
- onForegroundEvent = (
- observer: (event: NotifeeEvent) => Promise,
- ): (() => void) => notifee.onForegroundEvent(observer);
-
- onBackgroundEvent = (observer: (event: NotifeeEvent) => Promise) =>
- notifee.onBackgroundEvent(observer);
-
- incrementBadgeCount = async (incrementBy?: number) => {
- notifee.incrementBadgeCount(incrementBy);
- };
-
- decrementBadgeCount = async (decrementBy?: number) => {
- notifee.decrementBadgeCount(decrementBy);
- };
-
- setBadgeCount = async (count: number) => {
- notifee.setBadgeCount(count);
- };
-
- getBadgeCount = async () => notifee.getBadgeCount();
-
- handleNotificationPress = async ({
- detail,
- callback,
- }: {
- detail: EventDetail;
- callback?: (notification: Notification) => void;
- }) => {
- this.decrementBadgeCount(1);
- if (detail?.notification?.id) {
- await this.cancelTriggerNotification(detail.notification.id);
- }
-
- if (detail?.notification?.data) {
- callback?.(detail.notification as Notification);
- }
- };
-
- handleNotificationEvent = async ({
- type,
- detail,
- callback,
- }: NotifeeEvent & {
- callback?: (notification: Notification) => void;
- }) => {
- switch (type as unknown as EventType) {
- case EventType.DELIVERED:
- this.incrementBadgeCount(1);
- break;
- case EventType.PRESS:
- this.handleNotificationPress({
- detail,
- callback,
- });
- break;
- }
- };
-
- cancelTriggerNotification = async (id?: string) => {
- if (!id) return;
- await notifee.cancelTriggerNotification(id);
- };
-
- getInitialNotification = async () => notifee.getInitialNotification();
-
- cancelAllNotifications = async () => {
- await notifee.cancelAllNotifications();
- };
-
- createChannel = async (channel: AndroidChannel): Promise =>
- notifee.createChannel(channel);
-}
-
-export default new NotificationsService();
diff --git a/app/util/notifications/services/index.ts b/app/util/notifications/services/index.ts
deleted file mode 100644
index 529a6c3f602..00000000000
--- a/app/util/notifications/services/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './NotificationService';
diff --git a/app/util/notifications/settings/storage/constants.ts b/app/util/notifications/settings/storage/constants.ts
index f3bc4c2fb5c..fd34f849f6b 100644
--- a/app/util/notifications/settings/storage/constants.ts
+++ b/app/util/notifications/settings/storage/constants.ts
@@ -5,8 +5,7 @@ export const STORAGE_IDS = {
PUSH_NOTIFICATIONS_PROMPT_COUNT: 'pushNotificationsPromptCount',
PUSH_NOTIFICATIONS_PROMPT_TIME: 'pushNotificationsPromptTime',
DEVICE_ID_STORAGE_KEY: 'pns:deviceId',
- DEFAULT_NOTIFICATION_CHANNEL_ID: 'DEFAULT_NOTIFICATION_CHANNEL_ID',
- ANNOUNCEMENT_NOTIFICATION_CHANNEL_ID: 'ANNOUNCEMENT_NOTIFICATION_CHANNEL_ID',
+ ANDROID_DEFAULT_CHANNEL_ID: 'ANDROID_DEFAULT_CHANNEL_ID',
DEFAULT_PUSH_NOTIFICATION_CHANNEL_PRIORITY: 'high',
REQUEST_PERMISSION_ASKED: 'REQUEST_PERMISSION_ASKED',
REQUEST_PERMISSION_GRANTED: 'REQUEST_PERMISSION_GRANTED',
diff --git a/app/util/notifications/settings/storage/contants.test.ts b/app/util/notifications/settings/storage/contants.test.ts
index efb2cf68f91..ec76db3a580 100644
--- a/app/util/notifications/settings/storage/contants.test.ts
+++ b/app/util/notifications/settings/storage/contants.test.ts
@@ -9,9 +9,7 @@ describe('constants', () => {
PUSH_NOTIFICATIONS_PROMPT_COUNT: 'pushNotificationsPromptCount',
PUSH_NOTIFICATIONS_PROMPT_TIME: 'pushNotificationsPromptTime',
DEVICE_ID_STORAGE_KEY: 'pns:deviceId',
- DEFAULT_NOTIFICATION_CHANNEL_ID: 'DEFAULT_NOTIFICATION_CHANNEL_ID',
- ANNOUNCEMENT_NOTIFICATION_CHANNEL_ID:
- 'ANNOUNCEMENT_NOTIFICATION_CHANNEL_ID',
+ ANDROID_DEFAULT_CHANNEL_ID: 'ANDROID_DEFAULT_CHANNEL_ID',
DEFAULT_PUSH_NOTIFICATION_CHANNEL_PRIORITY: 'high',
REQUEST_PERMISSION_ASKED: 'REQUEST_PERMISSION_ASKED',
REQUEST_PERMISSION_GRANTED: 'REQUEST_PERMISSION_GRANTED',
diff --git a/app/util/notifications/setupAndroidChannels.test.ts b/app/util/notifications/setupAndroidChannels.test.ts
new file mode 100644
index 00000000000..e2e917f6e4f
--- /dev/null
+++ b/app/util/notifications/setupAndroidChannels.test.ts
@@ -0,0 +1,25 @@
+/* eslint-disable import/prefer-default-export */
+import notifee, { AndroidImportance } from '@notifee/react-native';
+import { setupAndroidChannel } from './setupAndroidChannels';
+import { STORAGE_IDS } from './settings/storage/constants';
+
+jest.mock('@notifee/react-native');
+const mockedNotifee = jest.mocked(notifee);
+
+describe('setupAndroidChannel', () => {
+ beforeEach(() => {
+ mockedNotifee.createChannel.mockClear();
+ });
+
+ it('should create android channel', async () => {
+ await setupAndroidChannel();
+
+ expect(mockedNotifee.createChannel).toHaveBeenCalledTimes(1);
+ expect(mockedNotifee.createChannel).toHaveBeenCalledWith({
+ id: STORAGE_IDS.ANDROID_DEFAULT_CHANNEL_ID,
+ importance: AndroidImportance.HIGH,
+ name: 'Default',
+ badge: true,
+ });
+ });
+});
diff --git a/app/util/notifications/setupAndroidChannels.ts b/app/util/notifications/setupAndroidChannels.ts
new file mode 100644
index 00000000000..d938acbc1e3
--- /dev/null
+++ b/app/util/notifications/setupAndroidChannels.ts
@@ -0,0 +1,12 @@
+/* eslint-disable import/prefer-default-export */
+import notifee, { AndroidImportance } from '@notifee/react-native';
+import { STORAGE_IDS } from './settings/storage/constants';
+
+export async function setupAndroidChannel() {
+ await notifee.createChannel({
+ id: STORAGE_IDS.ANDROID_DEFAULT_CHANNEL_ID,
+ importance: AndroidImportance.HIGH,
+ name: 'Default',
+ badge: true,
+ });
+}
diff --git a/app/util/notifications/types/notification/index.ts b/app/util/notifications/types/notification/index.ts
index 6b091239414..7bfd0b2af0c 100644
--- a/app/util/notifications/types/notification/index.ts
+++ b/app/util/notifications/types/notification/index.ts
@@ -108,6 +108,14 @@ export const STAKING_PROVIDER_MAP: Record<
[TRIGGER_TYPES.ROCKETPOOL_UNSTAKE_COMPLETED]: 'Rocket Pool-staked ETH',
};
+export const networkFeeDetails: Record = {
+ 'transactions.gas_limit': 'gasLimitUnits',
+ 'transactions.gas_used': 'gasUsedUnits',
+ 'transactions.base_fee': 'baseFee',
+ 'transactions.priority_fee': 'priorityFee',
+ 'transactions.max_fee': 'maxFeePerGas',
+};
+
export interface SimpleNotification {
title?: string;
body?: string;
@@ -115,3 +123,8 @@ export interface SimpleNotification {
[key: string]: string | object | number;
};
}
+
+export enum NotificationsKindTypes {
+ transaction = 'transaction',
+ announcements = 'announcements',
+}
diff --git a/app/util/smart-transactions/smart-publish-hook.test.ts b/app/util/smart-transactions/smart-publish-hook.test.ts
index 481932af255..c93cb77afe2 100644
--- a/app/util/smart-transactions/smart-publish-hook.test.ts
+++ b/app/util/smart-transactions/smart-publish-hook.test.ts
@@ -3,6 +3,7 @@
/* eslint-disable import/no-commonjs */
/* eslint-disable import/no-nodejs-modules */
require('dotenv').config({ path: '../../../.js.env' });
+import EventEmitter from 'events';
import {
TransactionType,
TransactionStatus,
@@ -11,20 +12,12 @@ import {
WalletDevice,
} from '@metamask/transaction-controller';
import SmartTransactionsController from '@metamask/smart-transactions-controller';
-import type { SmartTransaction } from '@metamask/smart-transactions-controller/dist/types';
import {
- AllowedActions,
- AllowedEvents,
SubmitSmartTransactionRequest,
submitSmartTransactionHook,
} from './smart-publish-hook';
import { ChainId } from '@metamask/controller-utils';
import { ApprovalController } from '@metamask/approval-controller';
-import { ControllerMessenger } from '@metamask/base-controller';
-import {
- NetworkControllerGetNetworkClientByIdAction,
- NetworkControllerStateChangeEvent,
-} from '@metamask/network-controller';
interface PendingApprovalsData {
id: string;
@@ -55,6 +48,7 @@ const transactionHash =
const stxUuid = 'uuid';
type SubmitSmartTransactionRequestMocked = SubmitSmartTransactionRequest & {
+ smartTransactionsController: jest.Mocked;
transactionController: jest.Mocked;
};
@@ -76,7 +70,7 @@ const createApprovalControllerMock = ({
pendingApprovals,
}: {
addAndShowApprovalRequest: () => void;
- pendingApprovals: PendingApprovalsData[];
+ pendingApprovals?: PendingApprovalsData[];
}) =>
({
state: {
@@ -86,6 +80,24 @@ const createApprovalControllerMock = ({
updateRequestState: jest.fn(),
} as unknown as jest.Mocked);
+const createSmartTransactionsControllerMock = () =>
+ ({
+ getFees: jest.fn(async () => ({
+ tradeTxFees: {
+ cancelFees: [],
+ feeEstimate: 42000000000000,
+ fees: [{ maxFeePerGas: 12843636951, maxPriorityFeePerGas: 2853145236 }],
+ gasLimit: 21000,
+ gasUsed: 21000,
+ },
+ })),
+ submitSignedTransactions: jest.fn(async () => ({
+ uuid: stxUuid,
+ txHash: transactionHash,
+ })),
+ eventEmitter: new EventEmitter(),
+ } as unknown as jest.Mocked);
+
const defaultTransactionMeta: TransactionMeta = {
origin: 'http://localhost',
hash: transactionHash,
@@ -114,491 +126,393 @@ const defaultTransactionMeta: TransactionMeta = {
// },
};
-type WithRequestOptions = {
- addAndShowApprovalRequest?: jest.Mock;
- pendingApprovals?: PendingApprovalsData[];
-} & Partial;
-
-type WithRequestCallback = ({
- request,
- controllerMessenger,
-}: {
- request: SubmitSmartTransactionRequestMocked;
- controllerMessenger: SubmitSmartTransactionRequestMocked['controllerMessenger'];
- getFeesSpy: jest.SpyInstance;
- submitSignedTransactionsSpy: jest.SpyInstance;
-}) => ReturnValue;
-
-type WithRequestArgs =
- | [WithRequestCallback]
- | [WithRequestOptions, WithRequestCallback];
-
-function withRequest(
- ...args: WithRequestArgs
-): ReturnValue {
- const [{ ...rest }, fn] = args.length === 2 ? args : [{}, args[0]];
- const {
- addAndShowApprovalRequest = getDefaultAddAndShowApprovalRequest(),
- pendingApprovals = [],
- ...options
- } = rest;
- const controllerMessenger = new ControllerMessenger<
- NetworkControllerGetNetworkClientByIdAction | AllowedActions,
- NetworkControllerStateChangeEvent | AllowedEvents
- >();
-
- const smartTransactionsController = new SmartTransactionsController({
- // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
- messenger: controllerMessenger.getRestricted({
- name: 'SmartTransactionsController',
- allowedActions: ['NetworkController:getNetworkClientById'],
- allowedEvents: ['NetworkController:stateChange'],
- }),
- getNonceLock: jest.fn(),
- confirmExternalTransaction: jest.fn(),
- trackMetaMetricsEvent: jest.fn(),
- getTransactions: jest.fn(),
- getMetaMetricsProps: jest.fn(),
- });
-
- const getFeesSpy = jest
- .spyOn(smartTransactionsController, 'getFees')
- .mockResolvedValue({
- tradeTxFees: {
- cancelFees: [],
- feeEstimate: 42000000000000,
- fees: [{ maxFeePerGas: 12843636951, maxPriorityFeePerGas: 2853145236 }],
- gasLimit: 21000,
- gasUsed: 21000,
- },
- approvalTxFees: null,
- });
- const submitSignedTransactionsSpy = jest
- .spyOn(smartTransactionsController, 'submitSignedTransactions')
- .mockResolvedValue({
- uuid: stxUuid,
- txHash: transactionHash,
- });
-
- const request: SubmitSmartTransactionRequestMocked = {
- transactionMeta: {
- ...defaultTransactionMeta,
- },
- smartTransactionsController,
- controllerMessenger,
- transactionController: createTransactionControllerMock(),
- shouldUseSmartTransaction: true,
- approvalController: createApprovalControllerMock({
- addAndShowApprovalRequest,
- pendingApprovals,
- }),
- featureFlags: {
- extensionActive: true,
- mobileActive: true,
- mobileActiveIOS: true,
- mobileActiveAndroid: true,
- smartTransactions: {
- expectedDeadline: 45,
- maxDeadline: 150,
- returnTxHashAsap: false,
- },
- mobile_active: true,
- extension_active: true,
- fallback_to_v1: false,
- fallbackToV1: false,
+const createRequest = ({
+ addAndShowApprovalRequest = getDefaultAddAndShowApprovalRequest(),
+ pendingApprovals = [] as PendingApprovalsData[],
+ transactionMeta = defaultTransactionMeta,
+} = {}) => ({
+ transactionMeta: {
+ ...transactionMeta,
+ },
+ smartTransactionsController: createSmartTransactionsControllerMock(),
+ transactionController: createTransactionControllerMock(),
+ shouldUseSmartTransaction: true,
+ approvalController: createApprovalControllerMock({
+ addAndShowApprovalRequest,
+ pendingApprovals,
+ }),
+ featureFlags: {
+ extensionActive: true,
+ mobileActive: true,
+ mobileActiveIOS: true,
+ mobileActiveAndroid: true,
+ smartTransactions: {
+ expectedDeadline: 45,
+ maxDeadline: 150,
+ returnTxHashAsap: false,
},
- ...options,
- };
-
- return fn({
- controllerMessenger,
- request,
- getFeesSpy,
- submitSignedTransactionsSpy,
- });
-}
+ mobile_active: true,
+ extension_active: true,
+ fallback_to_v1: false,
+ fallbackToV1: false,
+ },
+});
jest.setTimeout(10 * 1000);
describe('submitSmartTransactionHook', () => {
it('does not submit a transaction that is not a smart transaction', async () => {
- withRequest(async ({ request }) => {
- request.shouldUseSmartTransaction = false;
- const result = await submitSmartTransactionHook(request);
- expect(result).toEqual({ transactionHash: undefined });
- });
+ const request: SubmitSmartTransactionRequestMocked = createRequest();
+ request.shouldUseSmartTransaction = false;
+ const result = await submitSmartTransactionHook(request);
+ expect(result).toEqual({ transactionHash: undefined });
});
it('returns a txHash asap if the feature flag requires it', async () => {
- withRequest(async ({ request }) => {
- request.featureFlags.smartTransactions.returnTxHashAsap = true;
- const result = await submitSmartTransactionHook(request);
- expect(result).toEqual({ transactionHash });
- });
+ const request: SubmitSmartTransactionRequestMocked = createRequest();
+ request.featureFlags.smartTransactions.returnTxHashAsap = true;
+ const result = await submitSmartTransactionHook(request);
+ expect(result).toEqual({ transactionHash });
});
it('throws an error if there is no uuid', async () => {
- withRequest(async ({ request, submitSignedTransactionsSpy }) => {
- submitSignedTransactionsSpy.mockResolvedValue({
+ const request: SubmitSmartTransactionRequestMocked = createRequest();
+ request.smartTransactionsController.submitSignedTransactions = jest.fn(
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ async ({ signedTransactions, signedCanceledTransactions }) => ({
uuid: undefined,
- });
- await expect(submitSmartTransactionHook(request)).rejects.toThrow(
- 'No smart transaction UUID',
- );
- });
+ }),
+ );
+ await expect(submitSmartTransactionHook(request)).rejects.toThrow(
+ 'No smart transaction UUID',
+ );
});
it('throws an error if there is no transaction hash', async () => {
- withRequest(async ({ request, controllerMessenger }) => {
- setImmediate(() => {
- controllerMessenger.publish(
- 'SmartTransactionsController:smartTransaction',
- {
- status: 'cancelled',
- statusMetadata: {
- minedHash: '',
- },
- uuid: 'uuid',
- } as SmartTransaction,
- );
- });
- await expect(submitSmartTransactionHook(request)).rejects.toThrow(
- 'Transaction does not have a transaction hash, there was a problem',
+ const request: SubmitSmartTransactionRequestMocked = createRequest();
+ setImmediate(() => {
+ request.smartTransactionsController.eventEmitter.emit(
+ `uuid:smartTransaction`,
+ {
+ status: 'cancelled',
+ statusMetadata: {
+ minedHash: '',
+ },
+ },
);
});
+ await expect(submitSmartTransactionHook(request)).rejects.toThrow(
+ 'Transaction does not have a transaction hash, there was a problem',
+ );
});
it('throws an error if there is no origin', async () => {
- withRequest(async ({ request }) => {
- request.transactionMeta.origin = undefined;
- await expect(submitSmartTransactionHook(request)).rejects.toThrow(
- 'Origin is required',
- );
- });
+ const request: SubmitSmartTransactionRequestMocked = createRequest();
+ request.transactionMeta.origin = undefined;
+ await expect(submitSmartTransactionHook(request)).rejects.toThrow(
+ 'Origin is required',
+ );
});
it('submits a smart transaction', async () => {
- withRequest(
- async ({ request, controllerMessenger, submitSignedTransactionsSpy }) => {
- setImmediate(() => {
- controllerMessenger.publish(
- 'SmartTransactionsController:smartTransaction',
- {
- status: 'pending',
- statusMetadata: {
- minedHash: '',
- },
- uuid: 'uuid',
- } as SmartTransaction,
- );
-
- controllerMessenger.publish(
- 'SmartTransactionsController:smartTransaction',
- {
- status: 'success',
- statusMetadata: {
- minedHash: transactionHash,
- },
- uuid: 'uuid',
- } as SmartTransaction,
- );
- });
- const result = await submitSmartTransactionHook(request);
-
- expect(result).toEqual({ transactionHash });
- const { txParams, chainId } = request.transactionMeta;
- expect(
- request.transactionController.approveTransactionsWithSameNonce,
- ).toHaveBeenCalledWith(
- [
- {
- ...txParams,
- maxFeePerGas: '0x2fd8a58d7',
- maxPriorityFeePerGas: '0xaa0f8a94',
- chainId,
- value: undefined,
- },
- ],
- { hasNonce: true },
- );
- expect(submitSignedTransactionsSpy).toHaveBeenCalledWith({
- signedTransactions: [createSignedTransaction()],
- signedCanceledTransactions: [],
- txParams,
- transactionMeta: request.transactionMeta,
- });
+ const request: SubmitSmartTransactionRequestMocked = createRequest();
+ setImmediate(() => {
+ request.smartTransactionsController.eventEmitter.emit(
+ `uuid:smartTransaction`,
+ {
+ status: 'pending',
+ statusMetadata: {
+ minedHash: '',
+ },
+ },
+ );
- expect(
- request.approvalController.addAndShowApprovalRequest,
- ).toHaveBeenCalledWith({
- id: 'approvalId',
- origin: 'http://localhost',
- type: 'smart_transaction_status',
- requestState: {
- smartTransaction: {
- status: 'pending',
- uuid: stxUuid,
- creationTime: expect.any(Number),
- },
- isDapp: true,
- isInSwapFlow: false,
- isSwapApproveTx: false,
- isSwapTransaction: false,
+ request.smartTransactionsController.eventEmitter.emit(
+ `uuid:smartTransaction`,
+ {
+ status: 'success',
+ statusMetadata: {
+ minedHash: transactionHash,
},
- });
- expect(
- request.approvalController.updateRequestState,
- ).toHaveBeenCalledWith({
- id: 'approvalId',
- requestState: {
- smartTransaction: {
- status: 'success',
- statusMetadata: {
- minedHash:
- '0x0302b75dfb9fd9eb34056af031efcaee2a8cbd799ea054a85966165cd82a7356',
- },
- uuid: 'uuid',
- },
- isDapp: true,
- isInSwapFlow: false,
- isSwapApproveTx: false,
- isSwapTransaction: false,
+ },
+ );
+ });
+ const result = await submitSmartTransactionHook(request);
+
+ expect(result).toEqual({ transactionHash });
+ const { txParams, chainId } = request.transactionMeta;
+ expect(
+ request.transactionController.approveTransactionsWithSameNonce,
+ ).toHaveBeenCalledWith(
+ [
+ {
+ ...txParams,
+ maxFeePerGas: '0x2fd8a58d7',
+ maxPriorityFeePerGas: '0xaa0f8a94',
+ chainId,
+ value: undefined,
+ },
+ ],
+ { hasNonce: true },
+ );
+ expect(
+ request.smartTransactionsController.submitSignedTransactions,
+ ).toHaveBeenCalledWith({
+ signedTransactions: [createSignedTransaction()],
+ signedCanceledTransactions: [],
+ txParams,
+ transactionMeta: request.transactionMeta,
+ });
+
+ expect(
+ request.approvalController.addAndShowApprovalRequest,
+ ).toHaveBeenCalledWith({
+ id: 'approvalId',
+ origin: 'http://localhost',
+ type: 'smart_transaction_status',
+ requestState: {
+ smartTransaction: {
+ status: 'pending',
+ uuid: stxUuid,
+ creationTime: expect.any(Number),
+ },
+ isDapp: true,
+ isInSwapFlow: false,
+ isSwapApproveTx: false,
+ isSwapTransaction: false,
+ },
+ });
+ expect(request.approvalController.updateRequestState).toHaveBeenCalledWith({
+ id: 'approvalId',
+ requestState: {
+ smartTransaction: {
+ status: 'success',
+ statusMetadata: {
+ minedHash:
+ '0x0302b75dfb9fd9eb34056af031efcaee2a8cbd799ea054a85966165cd82a7356',
},
- });
+ },
+ isDapp: true,
+ isInSwapFlow: false,
+ isSwapApproveTx: false,
+ isSwapTransaction: false,
},
- );
+ });
});
describe('MM Swaps', () => {
it('starts an approval and does not end it if there is an swap tx that requires allowance', async () => {
- withRequest(
- {
- transactionMeta: {
- ...defaultTransactionMeta,
- // An ERC20 approve transaction
- ...{
- id: 'ec514870-fcee-11ee-8b89-2f9930c68b06',
- networkID: undefined,
- chainId: '0x1',
- origin: 'EXAMPLE_FOX_CODE',
- status: TransactionStatus.signed,
- time: 1713381359223,
- txParams: {
- from: '0xc5fe6ef47965741f6f7a4734bf784bf3ae3f2452',
- data: '0x095ea7b3000000000000000000000000881d40237659c251811cec9c364ef91dc08d300c0000000000000000000000000000000000000000000000000000000000989680',
- gas: '0xdd87',
- nonce: '0x217',
- to: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
- value: '0x0',
- maxFeePerGas: '0x62f500a7a',
- maxPriorityFeePerGas: '0x2d54010',
- estimatedBaseFee: '0x3a1b1a43e',
- },
- deviceConfirmedOn: WalletDevice.MM_MOBILE,
- verifiedOnBlockchain: false,
- securityAlertResponse: undefined,
- gasFeeEstimatesLoaded: true,
+ const request: SubmitSmartTransactionRequestMocked = createRequest({
+ transactionMeta: {
+ ...defaultTransactionMeta,
+ // An ERC20 approve transaction
+ ...{
+ id: 'ec514870-fcee-11ee-8b89-2f9930c68b06',
+ networkID: undefined,
+ chainId: '0x1',
+ origin: 'EXAMPLE_FOX_CODE',
+ status: TransactionStatus.signed,
+ time: 1713381359223,
+ txParams: {
+ from: '0xc5fe6ef47965741f6f7a4734bf784bf3ae3f2452',
+ data: '0x095ea7b3000000000000000000000000881d40237659c251811cec9c364ef91dc08d300c0000000000000000000000000000000000000000000000000000000000989680',
+ gas: '0xdd87',
+ nonce: '0x217',
+ to: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+ value: '0x0',
+ maxFeePerGas: '0x62f500a7a',
+ maxPriorityFeePerGas: '0x2d54010',
+ estimatedBaseFee: '0x3a1b1a43e',
},
+ deviceConfirmedOn: WalletDevice.MM_MOBILE,
+ verifiedOnBlockchain: false,
+ securityAlertResponse: undefined,
+ gasFeeEstimatesLoaded: true,
},
},
- async ({
- request,
- controllerMessenger,
- submitSignedTransactionsSpy,
- }) => {
- setImmediate(() => {
- controllerMessenger.publish(
- 'SmartTransactionsController:smartTransaction',
- {
- status: 'pending',
- statusMetadata: {
- minedHash: '',
- },
- uuid: 'uuid',
- } as SmartTransaction,
- );
+ });
+ setImmediate(() => {
+ request.smartTransactionsController.eventEmitter.emit(
+ `uuid:smartTransaction`,
+ {
+ status: 'pending',
+ statusMetadata: {
+ minedHash: '',
+ },
+ },
+ );
- controllerMessenger.publish(
- 'SmartTransactionsController:smartTransaction',
- {
- status: 'success',
- statusMetadata: {
- minedHash: transactionHash,
- },
- uuid: 'uuid',
- } as SmartTransaction,
- );
- });
- const result = await submitSmartTransactionHook(request);
+ request.smartTransactionsController.eventEmitter.emit(
+ `uuid:smartTransaction`,
+ {
+ status: 'success',
+ statusMetadata: {
+ minedHash: transactionHash,
+ },
+ },
+ );
+ });
+ const result = await submitSmartTransactionHook(request);
- expect(result).toEqual({ transactionHash });
- const { txParams, chainId } = request.transactionMeta;
- expect(
- request.transactionController.approveTransactionsWithSameNonce,
- ).toHaveBeenCalledWith(
- [
- {
- ...txParams,
- maxFeePerGas: '0x2fd8a58d7',
- maxPriorityFeePerGas: '0xaa0f8a94',
- chainId,
- value: '0x0',
- },
- ],
- { hasNonce: true },
- );
- expect(submitSignedTransactionsSpy).toHaveBeenCalledWith({
- signedTransactions: [createSignedTransaction()],
- signedCanceledTransactions: [],
- txParams,
- transactionMeta: request.transactionMeta,
- });
+ expect(result).toEqual({ transactionHash });
+ const { txParams, chainId } = request.transactionMeta;
+ expect(
+ request.transactionController.approveTransactionsWithSameNonce,
+ ).toHaveBeenCalledWith(
+ [
+ {
+ ...txParams,
+ maxFeePerGas: '0x2fd8a58d7',
+ maxPriorityFeePerGas: '0xaa0f8a94',
+ chainId,
+ value: '0x0',
+ },
+ ],
+ { hasNonce: true },
+ );
+ expect(
+ request.smartTransactionsController.submitSignedTransactions,
+ ).toHaveBeenCalledWith({
+ signedTransactions: [createSignedTransaction()],
+ signedCanceledTransactions: [],
+ txParams,
+ transactionMeta: request.transactionMeta,
+ });
- expect(
- request.approvalController.addAndShowApprovalRequest,
- ).toHaveBeenCalledWith({
+ expect(
+ request.approvalController.addAndShowApprovalRequest,
+ ).toHaveBeenCalledWith({
+ id: 'approvalId',
+ origin: 'EXAMPLE_FOX_CODE',
+ type: 'smart_transaction_status',
+ requestState: {
+ smartTransaction: {
+ status: 'pending',
+ uuid: stxUuid,
+ creationTime: expect.any(Number),
+ },
+ isDapp: false,
+ isInSwapFlow: true,
+ isSwapApproveTx: true,
+ isSwapTransaction: false,
+ },
+ });
+ expect(
+ request.approvalController.updateRequestState,
+ ).not.toHaveBeenCalled();
+ });
+ it('does not start an approval if a swap tx is after a swap allowance tx and ends the allowance', async () => {
+ const request: SubmitSmartTransactionRequestMocked = createRequest({
+ transactionMeta: {
+ ...defaultTransactionMeta,
+ // An ERC20 swap from transaction
+ ...{
+ chainId: '0x1',
+ deviceConfirmedOn: WalletDevice.MM_MOBILE,
+ gasFeeEstimatesLoaded: true,
+ id: '01c48130-fcf0-11ee-8f32-2f9930c68b06',
+ networkID: undefined,
+ origin: 'EXAMPLE_FOX_CODE',
+ rawTransaction:
+ '0x02f903560182021a840339802785063b5f780783038e2494881d40237659c251811cec9c364ef91dc08d300c80b902e65f5755290000000000000000000000000000000000000000000000000000000000000080000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000a7d8c000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000136f6e65496e6368563546656544796e616d6963000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a7d8c0000000000000000000000000000000000000000000000000000c8e72d12c36ac000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000001cf42ad63350000000000000000000000000f326e4de8f66a0bdc0970b79e0924e33c79f1915000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000c80502b1c5000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000a7d8c0000000000000000000000000000000000000000000000000000caad2bdb673320000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000140000000000000003b6d0340b4e16d0168e52d35cacd2c6185b44281ec28c9dc7dcbea7c000000000000000000000000000000000000000000000000001bc001a0c05c821f53b6750d9482d166d4860926fb215f63b5111e91abdb00c1ed8ad25da0455d063383fa7781e20457da191b2f0dd31b28eca0fe3604304ce4331fd737c7',
+ securityAlertResponse: undefined,
+ status: TransactionStatus.signed,
+ time: 1713381824707,
+ txParams: {
+ data: '0x5f5755290000000000000000000000000000000000000000000000000000000000000080000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000a7d8c000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000136f6e65496e6368563546656544796e616d6963000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a7d8c0000000000000000000000000000000000000000000000000000c8e72d12c36ac000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000001cf42ad63350000000000000000000000000f326e4de8f66a0bdc0970b79e0924e33c79f1915000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000c80502b1c5000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000a7d8c0000000000000000000000000000000000000000000000000000caad2bdb673320000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000140000000000000003b6d0340b4e16d0168e52d35cacd2c6185b44281ec28c9dc7dcbea7c000000000000000000000000000000000000000000000000001b',
+ estimatedBaseFee: '0x3a88ece0b',
+ from: '0xc5fe6ef47965741f6f7a4734bf784bf3ae3f2452',
+ gas: '0x38e24',
+ maxFeePerGas: '0x63b5f7807',
+ maxPriorityFeePerGas: '0x3398027',
+ nonce: '0x21a',
+ to: '0x881d40237659c251811cec9c364ef91dc08d300c',
+ value: '0x0',
+ },
+ verifiedOnBlockchain: false,
+ },
+ },
+ pendingApprovals: [
+ {
id: 'approvalId',
origin: 'EXAMPLE_FOX_CODE',
type: 'smart_transaction_status',
requestState: {
- smartTransaction: {
- status: 'pending',
- uuid: stxUuid,
- creationTime: expect.any(Number),
- },
- isDapp: false,
isInSwapFlow: true,
isSwapApproveTx: true,
- isSwapTransaction: false,
- },
- });
- expect(
- request.approvalController.updateRequestState,
- ).not.toHaveBeenCalled();
- },
- );
- });
- it('does not start an approval if a swap tx is after a swap allowance tx and ends the allowance', async () => {
- withRequest(
- {
- pendingApprovals: [
- {
- id: 'approvalId',
- origin: 'EXAMPLE_FOX_CODE',
- type: 'smart_transaction_status',
- requestState: {
- isInSwapFlow: true,
- isSwapApproveTx: true,
- },
},
- ],
- transactionMeta: {
- ...defaultTransactionMeta,
- // An ERC20 swap from transaction
- ...{
- chainId: '0x1',
- deviceConfirmedOn: WalletDevice.MM_MOBILE,
- gasFeeEstimatesLoaded: true,
- id: '01c48130-fcf0-11ee-8f32-2f9930c68b06',
- networkID: undefined,
- origin: 'EXAMPLE_FOX_CODE',
- rawTransaction:
- '0x02f903560182021a840339802785063b5f780783038e2494881d40237659c251811cec9c364ef91dc08d300c80b902e65f5755290000000000000000000000000000000000000000000000000000000000000080000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000a7d8c000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000136f6e65496e6368563546656544796e616d6963000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a7d8c0000000000000000000000000000000000000000000000000000c8e72d12c36ac000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000001cf42ad63350000000000000000000000000f326e4de8f66a0bdc0970b79e0924e33c79f1915000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000c80502b1c5000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000a7d8c0000000000000000000000000000000000000000000000000000caad2bdb673320000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000140000000000000003b6d0340b4e16d0168e52d35cacd2c6185b44281ec28c9dc7dcbea7c000000000000000000000000000000000000000000000000001bc001a0c05c821f53b6750d9482d166d4860926fb215f63b5111e91abdb00c1ed8ad25da0455d063383fa7781e20457da191b2f0dd31b28eca0fe3604304ce4331fd737c7',
- securityAlertResponse: undefined,
- status: TransactionStatus.signed,
- time: 1713381824707,
- txParams: {
- data: '0x5f5755290000000000000000000000000000000000000000000000000000000000000080000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000a7d8c000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000136f6e65496e6368563546656544796e616d6963000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a7d8c0000000000000000000000000000000000000000000000000000c8e72d12c36ac000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000001cf42ad63350000000000000000000000000f326e4de8f66a0bdc0970b79e0924e33c79f1915000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000c80502b1c5000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000a7d8c0000000000000000000000000000000000000000000000000000caad2bdb673320000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000140000000000000003b6d0340b4e16d0168e52d35cacd2c6185b44281ec28c9dc7dcbea7c000000000000000000000000000000000000000000000000001b',
- estimatedBaseFee: '0x3a88ece0b',
- from: '0xc5fe6ef47965741f6f7a4734bf784bf3ae3f2452',
- gas: '0x38e24',
- maxFeePerGas: '0x63b5f7807',
- maxPriorityFeePerGas: '0x3398027',
- nonce: '0x21a',
- to: '0x881d40237659c251811cec9c364ef91dc08d300c',
- value: '0x0',
- },
- verifiedOnBlockchain: false,
+ },
+ ],
+ });
+ setImmediate(() => {
+ request.smartTransactionsController.eventEmitter.emit(
+ `uuid:smartTransaction`,
+ {
+ status: 'pending',
+ statusMetadata: {
+ minedHash: '',
},
},
- },
- async ({
- request,
- controllerMessenger,
- submitSignedTransactionsSpy,
- }) => {
- setImmediate(() => {
- controllerMessenger.publish(
- 'SmartTransactionsController:smartTransaction',
- {
- status: 'pending',
- statusMetadata: {
- minedHash: '',
- },
- uuid: 'uuid',
- } as SmartTransaction,
- );
+ );
- controllerMessenger.publish(
- 'SmartTransactionsController:smartTransaction',
- {
- status: 'success',
- statusMetadata: {
- minedHash: transactionHash,
- },
- uuid: 'uuid',
- } as SmartTransaction,
- );
- });
- const result = await submitSmartTransactionHook(request);
+ request.smartTransactionsController.eventEmitter.emit(
+ `uuid:smartTransaction`,
+ {
+ status: 'success',
+ statusMetadata: {
+ minedHash: transactionHash,
+ },
+ },
+ );
+ });
+ const result = await submitSmartTransactionHook(request);
- expect(result).toEqual({ transactionHash });
- const { txParams, chainId } = request.transactionMeta;
- expect(
- request.transactionController.approveTransactionsWithSameNonce,
- ).toHaveBeenCalledWith(
- [
- {
- ...txParams,
- maxFeePerGas: '0x2fd8a58d7',
- maxPriorityFeePerGas: '0xaa0f8a94',
- chainId,
- value: '0x0',
- },
- ],
- { hasNonce: true },
- );
- expect(submitSignedTransactionsSpy).toHaveBeenCalledWith({
- signedTransactions: [createSignedTransaction()],
- signedCanceledTransactions: [],
- txParams,
- transactionMeta: request.transactionMeta,
- });
+ expect(result).toEqual({ transactionHash });
+ const { txParams, chainId } = request.transactionMeta;
+ expect(
+ request.transactionController.approveTransactionsWithSameNonce,
+ ).toHaveBeenCalledWith(
+ [
+ {
+ ...txParams,
+ maxFeePerGas: '0x2fd8a58d7',
+ maxPriorityFeePerGas: '0xaa0f8a94',
+ chainId,
+ value: '0x0',
+ },
+ ],
+ { hasNonce: true },
+ );
+ expect(
+ request.smartTransactionsController.submitSignedTransactions,
+ ).toHaveBeenCalledWith({
+ signedTransactions: [createSignedTransaction()],
+ signedCanceledTransactions: [],
+ txParams,
+ transactionMeta: request.transactionMeta,
+ });
- expect(
- request.approvalController.addAndShowApprovalRequest,
- ).not.toHaveBeenCalled();
- expect(
- request.approvalController.updateRequestState,
- ).toHaveBeenCalledWith({
- id: 'approvalId',
- requestState: {
- smartTransaction: {
- status: 'success',
- statusMetadata: {
- minedHash:
- '0x0302b75dfb9fd9eb34056af031efcaee2a8cbd799ea054a85966165cd82a7356',
- },
- uuid: 'uuid',
- },
- isDapp: false,
- isInSwapFlow: true,
- isSwapApproveTx: false,
- isSwapTransaction: true,
+ expect(
+ request.approvalController.addAndShowApprovalRequest,
+ ).not.toHaveBeenCalled();
+ expect(
+ request.approvalController.updateRequestState,
+ ).toHaveBeenCalledWith({
+ id: 'approvalId',
+ requestState: {
+ smartTransaction: {
+ status: 'success',
+ statusMetadata: {
+ minedHash:
+ '0x0302b75dfb9fd9eb34056af031efcaee2a8cbd799ea054a85966165cd82a7356',
},
- });
+ },
+ isDapp: false,
+ isInSwapFlow: true,
+ isSwapApproveTx: false,
+ isSwapTransaction: true,
},
- );
+ });
});
});
});
diff --git a/app/util/smart-transactions/smart-publish-hook.ts b/app/util/smart-transactions/smart-publish-hook.ts
index cd2fd2c24dd..21aed7ac663 100644
--- a/app/util/smart-transactions/smart-publish-hook.ts
+++ b/app/util/smart-transactions/smart-publish-hook.ts
@@ -3,9 +3,7 @@ import {
TransactionController,
TransactionMeta,
} from '@metamask/transaction-controller';
-import SmartTransactionsController, {
- SmartTransactionsControllerSmartTransactionEvent,
-} from '@metamask/smart-transactions-controller';
+import SmartTransactionsController from '@metamask/smart-transactions-controller';
import { ApprovalController } from '@metamask/approval-controller';
import {
getShouldStartApprovalRequest,
@@ -23,20 +21,14 @@ import { v1 as random } from 'uuid';
import { decimalToHex } from '../conversions';
import { ApprovalTypes } from '../../core/RPCMethods/RPCMethodMiddleware';
import { RAMPS_SEND } from '../../components/UI/Ramp/constants';
-import { ControllerMessenger } from '@metamask/base-controller';
import { addSwapsTransaction } from '../swaps/swaps-transactions';
export declare type Hex = `0x${string}`;
-export type AllowedActions = never;
-
-export type AllowedEvents = SmartTransactionsControllerSmartTransactionEvent;
-
export interface SubmitSmartTransactionRequest {
transactionMeta: TransactionMeta;
smartTransactionsController: SmartTransactionsController;
transactionController: TransactionController;
- controllerMessenger: ControllerMessenger;
shouldUseSmartTransaction: boolean;
approvalController: ApprovalController;
featureFlags: {
@@ -83,7 +75,6 @@ class SmartTransactionHook {
#approvalController: ApprovalController;
#transactionMeta: TransactionMeta;
#txParams: TransactionParams;
- #controllerMessenger: SubmitSmartTransactionRequest['controllerMessenger'];
#isDapp: boolean;
#isSend: boolean;
@@ -99,7 +90,6 @@ class SmartTransactionHook {
const {
transactionMeta,
smartTransactionsController,
- controllerMessenger,
transactionController,
shouldUseSmartTransaction,
approvalController,
@@ -115,7 +105,6 @@ class SmartTransactionHook {
this.#featureFlags = featureFlags;
this.#chainId = transactionMeta.chainId;
this.#txParams = transactionMeta.txParams;
- this.#controllerMessenger = controllerMessenger;
const {
isDapp,
@@ -387,19 +376,17 @@ class SmartTransactionHook {
};
#addListenerToUpdateStatusPage = async ({ uuid }: { uuid: string }) => {
- this.#controllerMessenger.subscribe(
- 'SmartTransactionsController:smartTransaction',
+ this.#smartTransactionsController.eventEmitter.on(
+ `${uuid}:smartTransaction`,
async (smartTransaction: SmartTransaction) => {
- if (uuid === smartTransaction.uuid) {
- const { status } = smartTransaction;
- if (!status || status === SmartTransactionStatuses.PENDING) {
- return;
- }
- if (this.#shouldUpdateApprovalRequest && !this.#approvalEnded) {
- await this.#updateApprovalRequest({
- smartTransaction,
- });
- }
+ const { status } = smartTransaction;
+ if (!status || status === SmartTransactionStatuses.PENDING) {
+ return;
+ }
+ if (this.#shouldUpdateApprovalRequest && !this.#approvalEnded) {
+ await this.#updateApprovalRequest({
+ smartTransaction,
+ });
}
},
);
@@ -411,26 +398,24 @@ class SmartTransactionHook {
uuid: string;
}): Promise =>
new Promise((resolve) => {
- this.#controllerMessenger.subscribe(
- 'SmartTransactionsController:smartTransaction',
+ this.#smartTransactionsController.eventEmitter.on(
+ `${uuid}:smartTransaction`,
async (smartTransaction: SmartTransaction) => {
- if (uuid === smartTransaction.uuid) {
- const { status, statusMetadata } = smartTransaction;
- Logger.log(LOG_PREFIX, 'Smart Transaction: ', smartTransaction);
- if (!status || status === SmartTransactionStatuses.PENDING) {
- return;
- }
- if (statusMetadata?.minedHash) {
- Logger.log(
- LOG_PREFIX,
- 'Smart Transaction - Received tx hash: ',
- statusMetadata?.minedHash,
- );
- resolve(statusMetadata.minedHash);
- } else {
- // cancelled status will have statusMetadata?.minedHash === ''
- resolve(null);
- }
+ const { status, statusMetadata } = smartTransaction;
+ Logger.log(LOG_PREFIX, 'Smart Transaction: ', smartTransaction);
+ if (!status || status === SmartTransactionStatuses.PENDING) {
+ return;
+ }
+ if (statusMetadata?.minedHash) {
+ Logger.log(
+ LOG_PREFIX,
+ 'Smart Transaction - Received tx hash: ',
+ statusMetadata?.minedHash,
+ );
+ resolve(statusMetadata.minedHash);
+ } else {
+ // cancelled status will have statusMetadata?.minedHash === ''
+ resolve(null);
}
},
);
diff --git a/app/util/test/accountsControllerTestUtils.ts b/app/util/test/accountsControllerTestUtils.ts
index 983a0ba94f9..8a89adf070f 100644
--- a/app/util/test/accountsControllerTestUtils.ts
+++ b/app/util/test/accountsControllerTestUtils.ts
@@ -1,7 +1,6 @@
import { v4 as uuidV4 } from 'uuid';
import { EthMethod, InternalAccount } from '@metamask/keyring-api';
import { AccountsControllerState } from '@metamask/accounts-controller';
-import { KeyringTypes } from '@metamask/keyring-controller';
export function createMockUuidFromAddress(address: string): string {
const fakeShaFromAddress = Array.from(
@@ -100,30 +99,3 @@ export function createMockAccountsControllerState(
},
};
}
-
-export function createMockAccountsControllerStateWithSnap(
- addresses: string[],
- snapAccountIndex: number = 0,
-): AccountsControllerState {
- if (addresses.length === 0) {
- throw new Error('At least one address is required');
- }
-
- if (snapAccountIndex < 0 || snapAccountIndex >= addresses.length) {
- throw new Error('Invalid snapAccountIndex');
- }
-
- const state = createMockAccountsControllerState(
- addresses,
- addresses[snapAccountIndex],
- );
-
- const snapAccountUuid = createMockUuidFromAddress(
- addresses[snapAccountIndex].toLowerCase(),
- );
- state.internalAccounts.accounts[snapAccountUuid].metadata.keyring = {
- type: KeyringTypes.snap,
- };
-
- return state;
-}
diff --git a/app/util/test/confirm-data-helpers.ts b/app/util/test/confirm-data-helpers.ts
deleted file mode 100644
index 40d3fa1c27c..00000000000
--- a/app/util/test/confirm-data-helpers.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { backgroundState } from './initial-root-state';
-
-export const personalSignatureConfirmationState = {
- engine: {
- backgroundState: {
- ...backgroundState,
- ApprovalController: {
- pendingApprovals: {
- '76b33b40-7b5c-11ef-bc0a-25bce29dbc09': {
- id: '76b33b40-7b5c-11ef-bc0a-25bce29dbc09',
- origin: 'metamask.github.io',
- type: 'personal_sign',
- time: 1727282253048,
- requestData: {
- data: '0x4578616d706c652060706572736f6e616c5f7369676e60206d657373616765',
- from: '0x935e73edb9ff52e23bac7f7e043a1ecd06d05477',
- meta: {
- url: 'https://metamask.github.io/test-dapp/',
- title: 'E2E Test Dapp',
- icon: { uri: 'https://metamask.github.io/metamask-fox.svg' },
- analytics: { request_source: 'In-App-Browser' },
- },
- origin: 'metamask.github.io',
- metamaskId: '76b33b40-7b5c-11ef-bc0a-25bce29dbc09',
- },
- requestState: null,
- expectsResult: true,
- },
- },
- pendingApprovalCount: 1,
- approvalFlows: [],
- },
- },
- },
-};
diff --git a/app/util/test/initial-background-state.json b/app/util/test/initial-background-state.json
index 9cf1471581a..db24fb07aba 100644
--- a/app/util/test/initial-background-state.json
+++ b/app/util/test/initial-background-state.json
@@ -129,28 +129,26 @@
},
"SmartTransactionsController": {
"smartTransactionsState": {
- "smartTransactions": {
- "0x1": []
- },
- "userOptIn": null,
- "userOptInV2": null,
+ "smartTransactions": {},
+ "userOptIn": false,
+ "userOptInV2": false,
"fees": {
- "approvalTxFees": null,
- "tradeTxFees": null
+ "approvalTxFees": false,
+ "tradeTxFees": false
},
"liveness": true,
"livenessByChainId": {
- "0x1": true,
- "0xaa36a7": true
+ "mainnet": true,
+ "sepolia": true
},
"feesByChainId": {
- "0x1": {
- "approvalTxFees": null,
- "tradeTxFees": null
+ "mainnet": {
+ "approvalTxFees": false,
+ "tradeTxFees": false
},
- "0xaa36a7": {
- "approvalTxFees": null,
- "tradeTxFees": null
+ "sepolia": {
+ "approvalTxFees": false,
+ "tradeTxFees": false
}
}
}
diff --git a/app/util/test/keyringControllerTestUtils.ts b/app/util/test/keyringControllerTestUtils.ts
deleted file mode 100644
index 4e5075cef4b..00000000000
--- a/app/util/test/keyringControllerTestUtils.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { KeyringObject, KeyringTypes } from '@metamask/keyring-controller';
-
-export const mockSimpleKeyringAddress =
- '0xd018538C87232FF95acbCe4870629b75640a78E7';
-export const mockQrKeyringAddress =
- '0xB374Ca013934e498e5baD3409147F34E6c462389';
-export const mockHDKeyringAddress =
- '0x71C7656EC7ab88b098defB751B7401B5f6d8976F';
-
-const MOCK_DEFAULT_KEYRINGS: KeyringObject[] = [
- {
- accounts: [mockSimpleKeyringAddress],
- type: KeyringTypes.simple,
- },
- {
- accounts: [mockQrKeyringAddress],
- type: KeyringTypes.qr,
- },
- {
- accounts: [mockHDKeyringAddress],
- type: KeyringTypes.hd,
- },
-];
-
-export const MOCK_KEYRING_CONTROLLER_STATE = {
- keyring: {
- keyrings: [
- {
- mnemonic:
- 'one two three four five six seven eight nine ten eleven twelve',
- },
- ],
- },
- state: {
- keyrings: MOCK_DEFAULT_KEYRINGS,
- },
-};
diff --git a/app/util/validators/index.ts b/app/util/validators/index.js
similarity index 75%
rename from app/util/validators/index.ts
rename to app/util/validators/index.js
index a3f5551ab09..83e47889f96 100644
--- a/app/util/validators/index.ts
+++ b/app/util/validators/index.js
@@ -2,7 +2,7 @@ import { ethers } from 'ethers';
import { Encryptor, LEGACY_DERIVATION_OPTIONS } from '../../core/Encryptor';
import { regex } from '../regex';
-export const failedSeedPhraseRequirements = (seed: string): boolean => {
+export const failedSeedPhraseRequirements = (seed) => {
const wordCount = seed.split(/\s/u).length;
return wordCount % 3 !== 0 || wordCount > 24 || wordCount < 12;
};
@@ -14,8 +14,8 @@ export const failedSeedPhraseRequirements = (seed: string): boolean => {
* @param {string} vault - exported from ios/android filesystem
* @returns seed phrase from vault
*/
-export const parseVaultValue = async (password: string, vault: string): Promise => {
- let vaultSeed: string | undefined;
+export const parseVaultValue = async (password, vault) => {
+ let vaultSeed;
if (vault[0] === '{' && vault[vault.length - 1] === '}')
try {
@@ -29,7 +29,7 @@ export const parseVaultValue = async (password: string, vault: string): Promise<
const encryptor = new Encryptor({
keyDerivationOptions: LEGACY_DERIVATION_OPTIONS,
});
- const result = await encryptor.decrypt(password, vault) as { data?: { mnemonic?: string } }[];
+ const result = await encryptor.decrypt(password, vault);
vaultSeed = result[0]?.data?.mnemonic;
}
} catch (error) {
@@ -38,7 +38,7 @@ export const parseVaultValue = async (password: string, vault: string): Promise<
return vaultSeed;
};
-export const parseSeedPhrase = (seedPhrase: string): string =>
+export const parseSeedPhrase = (seedPhrase) =>
(seedPhrase || '').trim().toLowerCase().match(regex.seedPhrase)?.join(' ') ||
'';
diff --git a/bitrise.yml b/bitrise.yml
index ee7c4fbcb58..25aaec99ee9 100644
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -249,17 +249,16 @@ workflows:
prep_environment:
steps:
- script@1:
- title: node, yarn, corepack installation
inputs:
- content: |-
#!/usr/bin/env bash
echo "Gems being installed with bundler gem"
- bundle install --gemfile=ios/Gemfile
+ bundle install
echo "Node $NODE_VERSION being installed"
set -e
- # Add and enable NVM
+ # Install and enable NVM
wget -O install-nvm.sh "https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.sh"
echo "${NVM_SHA256SUM} install-nvm.sh" > install-nvm.sh.SHA256SUM
sha256sum -c install-nvm.sh.SHA256SUM
@@ -277,16 +276,15 @@ workflows:
npm i -g "corepack@$COREPACK_VERSION"
echo "Corepack enabling $YARN_VERSION"
corepack enable
- install_applesimutils:
+ title: Install node, yarn and corepack
+ install_detox:
steps:
- script@1:
- title: applesimutils installation
inputs:
- content: |-
#!/usr/bin/env bash
- echo "Now installing applesimutils..."
- brew tap wix/brew
- brew install applesimutils
+ scripts/detox-setup.sh
+ title: Install Detox Dependencies
# Notifications utility workflows
# Provides values for commit or branch message and path depending on commit env setup initialised or not
@@ -571,6 +569,7 @@ workflows:
android_e2e_build:
before_run:
- code_setup
+ - install_detox
- set_commit_hash
after_run:
- notify_failure
@@ -645,6 +644,7 @@ workflows:
android_e2e_test:
before_run:
- setup
+ - install_detox
- prep_environment
after_run:
- notify_failure
@@ -737,7 +737,7 @@ workflows:
ios_api_specs:
before_run:
- setup
- - install_applesimutils
+ - install_detox
- prep_environment
after_run:
- notify_failure
@@ -803,8 +803,8 @@ workflows:
title: Deploy test report files
ios_e2e_build:
before_run:
- - install_applesimutils
- code_setup
+ - install_detox
- set_commit_hash
after_run:
- notify_failure
@@ -833,7 +833,7 @@ workflows:
inputs:
- content: |-
#!/usr/bin/env bash
- HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install ccache
+ brew install ccache with HOMEBREW_NO_DEPENDENTS_CHECK=1
ln -s $(which ccache) /usr/local/bin/gcc
ln -s $(which ccache) /usr/local/bin/g++
ln -s $(which ccache) /usr/local/bin/cc
@@ -890,7 +890,7 @@ workflows:
ios_e2e_test:
before_run:
- setup
- - install_applesimutils
+ - install_detox
- prep_environment
after_run:
- notify_failure
@@ -1497,16 +1497,16 @@ app:
PROJECT_LOCATION_IOS: ios
- opts:
is_expand: false
- VERSION_NAME: 7.31.0
+ VERSION_NAME: 7.32.0
- opts:
is_expand: false
- VERSION_NUMBER: 1432
+ VERSION_NUMBER: 1441
- opts:
is_expand: false
- FLASK_VERSION_NAME: 7.31.0
+ FLASK_VERSION_NAME: 7.32.0
- opts:
is_expand: false
- FLASK_VERSION_NUMBER: 1432
+ FLASK_VERSION_NUMBER: 1441
- opts:
is_expand: false
ANDROID_APK_LINK: ''
diff --git a/docs/readme/environment.md b/docs/readme/environment.md
index 33c61ad3f2f..e5e36abb22f 100644
--- a/docs/readme/environment.md
+++ b/docs/readme/environment.md
@@ -30,7 +30,7 @@ Install ruby version defined in the file `.ruby-version`
Install [`bundler`](https://bundler.io/) gem to manage and install gems such as Cocoapods. The `bundle install` command, which is run during `yarn setup` handles installing gem versions as specified in the project's `GemFile`
```bash
-gem install bundler -v 2.5.8 && bundle install --gemfile=ios/Gemfile
+gem install bundler -v 2.5.8 && bundle install
```
### Xcode
diff --git a/e2e/helpers.js b/e2e/helpers.js
index 89c665fdec9..d1b169fb58d 100644
--- a/e2e/helpers.js
+++ b/e2e/helpers.js
@@ -1,4 +1,4 @@
-import { waitFor, web, system } from 'detox';
+import { waitFor, web } from 'detox';
import {
getFixturesServerPort,
getGanachePort,
diff --git a/e2e/pages/AddCustomTokenView.js b/e2e/pages/AddCustomTokenView.js
new file mode 100644
index 00000000000..a4eebda8248
--- /dev/null
+++ b/e2e/pages/AddCustomTokenView.js
@@ -0,0 +1,103 @@
+import TestHelpers from '../helpers';
+import {
+ CUSTOM_TOKEN_BACK_BUTTON_ID,
+ CUSTOM_TOKEN_CONTAINER_ID,
+ TOKEN_ADDRESS_INPUT_BOX_ID,
+ TOKEN_ADDRESS_SYMBOL_ID,
+ TOKEN_IMPORT_BUTTON_ID,
+} from '../../wdio/screen-objects/testIDs/Screens/AddCustomToken.testIds';
+import {
+ NFT_ADDRESS_INPUT_BOX_ID,
+ NFT_ADDRESS_WARNING_MESSAGE_ID,
+ NFT_IDENTIFIER_INPUT_BOX_ID,
+ NEXT_BUTTON_CUSTOM_IMPORT,
+} from '../../wdio/screen-objects/testIDs/Screens/NFTImportScreen.testIds';
+import { AddCustomTokenViewSelectorsText } from '../selectors/AddCustomTokenView.selectors';
+
+export default class AddCustomTokenView {
+ static async tapImportButton() {
+ //await TestHelpers.swipe(TOKEN_ADDRESS_SYMBOL_ID, 'up', 'slow', 0.6);
+ await TestHelpers.waitAndTapText(
+ AddCustomTokenViewSelectorsText.IMPORT_BUTTON,
+ );
+ }
+
+ static async tapCustomTokenImportButton() {
+ await TestHelpers.delay(1500);
+ if (device.getPlatform() === 'android') {
+ await TestHelpers.waitAndTapByLabel(TOKEN_IMPORT_BUTTON_ID);
+ } else {
+ await TestHelpers.tap(TOKEN_IMPORT_BUTTON_ID);
+ }
+ }
+
+ static async tapBackButton() {
+ await TestHelpers.tap(CUSTOM_TOKEN_BACK_BUTTON_ID);
+ }
+
+ static async tapNextButton() {
+ await TestHelpers.tap(NEXT_BUTTON_CUSTOM_IMPORT);
+ }
+
+ static async tapTokenSymbolInputBox() {
+ await TestHelpers.waitAndTap(TOKEN_ADDRESS_SYMBOL_ID);
+ }
+
+ static async tapTokenSymbolText() {
+ await TestHelpers.tapByText(AddCustomTokenViewSelectorsText.TOKEN_SYMBOL);
+ }
+
+ static async scrollDownOnImportCustomTokens() {
+ await TestHelpers.swipe(TOKEN_ADDRESS_SYMBOL_ID, 'up', 'slow', 0.6);
+ }
+
+ static async typeTokenAddress(address) {
+ if (device.getPlatform() === 'android') {
+ await TestHelpers.replaceTextInField(TOKEN_ADDRESS_INPUT_BOX_ID, address);
+ await element(by.id(TOKEN_ADDRESS_INPUT_BOX_ID)).tapReturnKey();
+ } else {
+ await TestHelpers.typeText(TOKEN_ADDRESS_INPUT_BOX_ID, address + '\n');
+ }
+ }
+
+ static async typeInNFTAddress(address) {
+ if (device.getPlatform() === 'android') {
+ await TestHelpers.replaceTextInField(NFT_ADDRESS_INPUT_BOX_ID, address);
+ await element(by.id(NFT_ADDRESS_INPUT_BOX_ID)).tapReturnKey();
+ } else {
+ await TestHelpers.typeTextAndHideKeyboard(
+ NFT_ADDRESS_INPUT_BOX_ID,
+ address,
+ );
+ }
+ }
+
+ static async typeInNFTIdentifier(identifier) {
+ if (device.getPlatform() === 'android') {
+ await TestHelpers.replaceTextInField(
+ NFT_IDENTIFIER_INPUT_BOX_ID,
+ identifier,
+ );
+ await element(by.id(NFT_IDENTIFIER_INPUT_BOX_ID)).tapReturnKey();
+ } else {
+ await TestHelpers.typeTextAndHideKeyboard(
+ NFT_IDENTIFIER_INPUT_BOX_ID,
+ identifier,
+ );
+ }
+ }
+
+ static async isVisible() {
+ await TestHelpers.checkIfVisible(CUSTOM_TOKEN_CONTAINER_ID);
+ }
+
+ static async isNFTAddressWarningVisible() {
+ await TestHelpers.checkIfVisible(NFT_ADDRESS_WARNING_MESSAGE_ID);
+ }
+
+ static async switchToCustomTab() {
+ await TestHelpers.tapByText(
+ AddCustomTokenViewSelectorsText.CUSTOM_TOKEN_TAB,
+ );
+ }
+}
diff --git a/e2e/pages/ConfirmAddAsset.js b/e2e/pages/ConfirmAddAsset.js
new file mode 100644
index 00000000000..6e962dbb7f5
--- /dev/null
+++ b/e2e/pages/ConfirmAddAsset.js
@@ -0,0 +1,35 @@
+import TestHelpers from '../helpers';
+import {
+ ADD_CANCEL_ADD_CUSTOM_ASSET_MODAL,
+ ADD_CONFIRM_CUSTOM_ASSET,
+} from '../../wdio/screen-objects/testIDs/Screens/AddCustomToken.testIds';
+
+import { ImportTokenViewSelectorsText } from '../selectors/ImportTokenView.selectors';
+
+export default class ConfirmAddAssetView {
+ static async tapOnCancelButton() {
+ await TestHelpers.tapByText(
+ ImportTokenViewSelectorsText.CANCEL_IMPORT_TOKEN,
+ );
+ }
+
+ static async tapOnConfirmButton() {
+ await TestHelpers.tapByText(
+ ImportTokenViewSelectorsText.CONFIRM_IMPORT_TOKEN,
+ );
+ }
+
+ static async isVisible() {
+ await TestHelpers.checkIfVisible(ADD_CONFIRM_CUSTOM_ASSET);
+ }
+
+ static async cancelModalIsVisible() {
+ await TestHelpers.checkIfVisible(ADD_CANCEL_ADD_CUSTOM_ASSET_MODAL);
+ }
+
+ static async tapOnConfirmModalButton() {
+ await TestHelpers.tapByText(
+ ImportTokenViewSelectorsText.CONFIRM_CANCEL_IMPORT_TOKEN,
+ );
+ }
+}
diff --git a/e2e/pages/ContractNickNameView.js b/e2e/pages/ContractNickNameView.js
new file mode 100644
index 00000000000..c466a4f0531
--- /dev/null
+++ b/e2e/pages/ContractNickNameView.js
@@ -0,0 +1,44 @@
+import TestHelpers from '../helpers';
+import { ContractNickNameViewSelectorsIDs } from '../selectors/ContractNickNameView.selectors';
+
+export default class ContractNickNameView {
+ static async typeContractNickName(nickName) {
+ if (device.getPlatform() === 'android') {
+ await TestHelpers.replaceTextInField(
+ ContractNickNameViewSelectorsIDs.NAME_INPUT,
+ nickName,
+ );
+ await element(
+ by.id(ContractNickNameViewSelectorsIDs.NAME_INPUT),
+ ).tapReturnKey();
+ } else {
+ await TestHelpers.typeTextAndHideKeyboard(
+ ContractNickNameViewSelectorsIDs.NAME_INPUT,
+ nickName,
+ );
+ }
+ }
+
+ static async clearNickName() {
+ await TestHelpers.replaceTextInField(
+ ContractNickNameViewSelectorsIDs.NAME_INPUT,
+ '',
+ );
+ }
+
+ static async tapConfirmButton() {
+ await TestHelpers.waitAndTap(
+ ContractNickNameViewSelectorsIDs.CONFIRM_BUTTON,
+ );
+ }
+
+ static async isVisible() {
+ await TestHelpers.checkIfVisible(
+ ContractNickNameViewSelectorsIDs.CONTAINER,
+ );
+ }
+
+ static async isContractNickNameInInputBoxVisible(nickName) {
+ await TestHelpers.checkIfElementWithTextIsVisible(nickName);
+ }
+}
diff --git a/e2e/pages/EnableDeviceNotificationsAlert.js b/e2e/pages/EnableDeviceNotificationsAlert.js
deleted file mode 100644
index a5e6e512451..00000000000
--- a/e2e/pages/EnableDeviceNotificationsAlert.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import Gestures from '../utils/Gestures';
-import Matchers from '../utils/Matchers';
-
-import {
- ENABLE_DEVICE_NOTIFICATIONS_CONTAINER_ID,
- ENABLE_DEVICE_NOTIFICATIONS_NO_THANKS_BUTTON_ID,
- ENABLE_DEVICE_NOTIFICATIONS_YES_BUTTON_ID
-} from '../../wdio/screen-objects/testIDs/Screens/EnableDeviceNotificationsChecksAlert.testIds';
-
-class EnableDeviceNotificationsAlert {
- get stepOneContainer() {
- return Matchers.getSystemElementByText(ENABLE_DEVICE_NOTIFICATIONS_CONTAINER_ID);
- }
-
- get getEnableDeviceNotificationsButton() {
- return Matchers.getSystemElementByText(
- ENABLE_DEVICE_NOTIFICATIONS_YES_BUTTON_ID,
- );
- }
-
- get getNotEnableDeviceNotificationsButton() {
- return Matchers.getSystemElementByText(
- ENABLE_DEVICE_NOTIFICATIONS_NO_THANKS_BUTTON_ID,
- );
- }
-
- async tapOnEnableDeviceNotificationsButton() {
- await Gestures.waitAndTap(this.getEnableDeviceNotificationsButton);
- }
-
- async tapOnNotEnableDeviceNotificationsButton() {
- await Gestures.waitAndTap(this.getNotEnableDeviceNotificationsButton);
- }
-}
-
-export default new EnableDeviceNotificationsAlert();
diff --git a/e2e/pages/ImportTokensView.js b/e2e/pages/ImportTokensView.js
new file mode 100644
index 00000000000..88c0dc1bd84
--- /dev/null
+++ b/e2e/pages/ImportTokensView.js
@@ -0,0 +1,43 @@
+import TestHelpers from '../helpers';
+import { CUSTOM_TOKEN_CONTAINER_ID } from '../../wdio/screen-objects/testIDs/Screens/AddCustomToken.testIds';
+import {
+ ASSET_BACK_BUTTON,
+ TOKEN_INPUT_BOX_ID,
+ TOKEN_IMPORT_NEXT_BUTTON,
+} from '../../wdio/screen-objects/testIDs/Screens/AssetSearch.testIds';
+import {
+ ImportTokenViewSelectorsIDs,
+ ImportTokenViewSelectorsText,
+} from '../selectors/ImportTokenView.selectors';
+
+export default class ImportTokensView {
+ static async tapImportButton() {
+ await TestHelpers.swipe(TOKEN_INPUT_BOX_ID, 'up', 'fast');
+
+ await TestHelpers.tapByText(ImportTokenViewSelectorsText.IMPORT_BUTTON);
+ }
+ static async tapBackButton() {
+ await TestHelpers.tap(ASSET_BACK_BUTTON);
+ }
+
+ static async typeInTokenName(tokenName) {
+ await TestHelpers.checkIfExists(TOKEN_INPUT_BOX_ID);
+
+ await TestHelpers.typeTextAndHideKeyboard(TOKEN_INPUT_BOX_ID, tokenName);
+ }
+ static async tapOnToken() {
+ await TestHelpers.tapItemAtIndex(ImportTokenViewSelectorsIDs.CONTAINER);
+ }
+
+ static async tapOnCancelButton() {
+ await TestHelpers.tapByText(ImportTokenViewSelectorsText.CANCEL_BUTTON);
+ }
+
+ static async isVisible() {
+ await TestHelpers.checkIfVisible(CUSTOM_TOKEN_CONTAINER_ID);
+ }
+
+ static async tapOnNextButton() {
+ await TestHelpers.tap(TOKEN_IMPORT_NEXT_BUTTON);
+ }
+}
diff --git a/e2e/pages/Onboarding/DefaultNetworkView.js b/e2e/pages/Onboarding/DefaultNetworkView.js
new file mode 100644
index 00000000000..13bb5930ef0
--- /dev/null
+++ b/e2e/pages/Onboarding/DefaultNetworkView.js
@@ -0,0 +1,29 @@
+import Matchers from '../../utils/Matchers';
+import Gestures from '../../utils/Gestures';
+import NetworksView from '../Settings/NetworksView';
+import {
+ CustomDefaultNetworkIDs,
+ CustomDefaultNetworkTexts,
+} from '../../selectors/Onboarding/CustomDefaultNetwork.selectors';
+class DefaultNetworkView {
+ get useThisNetworkButton() {
+ return device.getPlatform() === 'ios'
+ ? Matchers.getElementByID(
+ CustomDefaultNetworkIDs.USE_THIS_NETWORK_BUTTON_ID,
+ )
+ : Matchers.getElementByLabel(
+ CustomDefaultNetworkTexts.USE_THIS_NETWORK_BUTTON_TEXT,
+ );
+ }
+
+ async tapUseThisNetworkButton() {
+ await Gestures.waitAndTap(this.useThisNetworkButton);
+ }
+
+ async typeRpcURL(rpcURL) {
+ await (await NetworksView.rpcURLInput).clearText();
+ await NetworksView.typeInRpcUrl(rpcURL);
+ }
+}
+
+export default new DefaultNetworkView();
diff --git a/e2e/pages/Onboarding/MetaMetricsOptInView.js b/e2e/pages/Onboarding/MetaMetricsOptInView.js
index e2b8d678af8..a2c0ab960a1 100644
--- a/e2e/pages/Onboarding/MetaMetricsOptInView.js
+++ b/e2e/pages/Onboarding/MetaMetricsOptInView.js
@@ -36,6 +36,15 @@ class MetaMetricsOptIn {
await Gestures.swipe(this.optInMetricsContent, 'up', 'fast', 0.9);
await Gestures.waitAndTap(this.noThanksButton);
}
+
+ async tapEditDefaultNetworkHere() {
+ await Gestures.swipe(this.optInMetricsContent, 'up', 'fast', 0.9);
+ if (device.getPlatform() === 'ios') {
+ await Gestures.tapAtPoint(this.container, { x: 333, y: 534 });
+ } else {
+ await Gestures.tapAtPoint(this.optInMetricsContent, { x: 15, y: 570 });
+ }
+ }
}
export default new MetaMetricsOptIn();
diff --git a/e2e/pages/TokenOverview.js b/e2e/pages/TokenOverview.js
index 433b8ad3aa2..5cb1c1f6bbc 100644
--- a/e2e/pages/TokenOverview.js
+++ b/e2e/pages/TokenOverview.js
@@ -5,8 +5,8 @@ import {
TOKEN_OVERVIEW_RECEIVE_BUTTON,
TOKEN_OVERVIEW_BUY_BUTTON,
TOKEN_OVERVIEW_SWAP_BUTTON,
+ ASSET_BACK_BUTTON,
} from '../../wdio/screen-objects/testIDs/Screens/TokenOverviewScreen.testIds';
-import { ImportTokenViewSelectorsIDs } from '../selectors/wallet/ImportTokenView.selectors';
import enContent from '../../locales/languages/en.json';
const chartTimePeriod = [
@@ -32,7 +32,7 @@ export default class TokenOverview {
}
static async tapBackButton() {
- await TestHelpers.waitAndTap(ImportTokenViewSelectorsIDs.BACK_BUTTON);
+ await TestHelpers.waitAndTap(ASSET_BACK_BUTTON);
}
static async isVisible() {
diff --git a/e2e/pages/wallet/ImportNFTFlow/ImportNFTView.js b/e2e/pages/wallet/ImportNFTFlow/ImportNFTView.js
deleted file mode 100644
index 67aa531376e..00000000000
--- a/e2e/pages/wallet/ImportNFTFlow/ImportNFTView.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import Matchers from '../../../utils/Matchers';
-import Gestures from '../../../utils/Gestures';
-import { NFTImportScreenSelectorsIDs } from '../../../selectors/wallet/ImportNFTView.selectors';
-
-class ImportNFTView {
- get container() {
- return Matchers.getElementByID(NFTImportScreenSelectorsIDs.CONTAINER);
- }
-
- get addressInput() {
- return Matchers.getElementByID(NFTImportScreenSelectorsIDs.ADDRESS_INPUT_BOX);
- }
-
- get addressWarningMessage() {
- return Matchers.getElementByID(NFTImportScreenSelectorsIDs.ADDRESS_WARNING_MESSAGE);
- }
-
- get identifierInput() {
- return Matchers.getElementByID(NFTImportScreenSelectorsIDs.IDENTIFIER_INPUT_BOX);
- }
-
- async typeInNFTAddress(address) {
- await Gestures.typeTextAndHideKeyboard(this.addressInput, address);
- }
-
- async typeInNFTIdentifier(identifier) {
- await Gestures.typeTextAndHideKeyboard(this.identifierInput, identifier);
- }
-}
-
-export default new ImportNFTView();
diff --git a/e2e/pages/wallet/ImportTokenFlow/ConfirmAddAsset.js b/e2e/pages/wallet/ImportTokenFlow/ConfirmAddAsset.js
deleted file mode 100644
index 8c3db67bf37..00000000000
--- a/e2e/pages/wallet/ImportTokenFlow/ConfirmAddAsset.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import {
- ImportTokenViewSelectorsIDs,
- ImportTokenViewSelectorsText
-} from '../../../selectors/wallet/ImportTokenView.selectors';
-import Matchers from '../../../utils/Matchers';
-import Gestures from '../../../utils/Gestures';
-
-class ConfirmAddAssetView {
- get container() {
- return Matchers.getElementByID(ImportTokenViewSelectorsIDs.ADD_CONFIRM_CUSTOM_ASSET);
- }
-
- get cancelButton() {
- return Matchers.getElementByText(ImportTokenViewSelectorsText.CANCEL_IMPORT_TOKEN);
- }
-
- get confirmButton() {
- return Matchers.getElementByText(ImportTokenViewSelectorsText.CONFIRM_IMPORT_TOKEN);
- }
-
- get cancelModal() {
- return Matchers.getElementByID(ImportTokenViewSelectorsIDs.ADD_CANCEL_ADD_CUSTOM_ASSET_MODAL);
- }
-
- get confirmButtonModal() {
- return Matchers.getElementByText(ImportTokenViewSelectorsText.CONFIRM_CANCEL_IMPORT_TOKEN);
- }
-
- async tapOnCancelButton() {
- await Gestures.waitAndTap(this.cancelButton);
- }
-
- async tapOnConfirmButton() {
- await Gestures.waitAndTap(this.confirmButton);
- }
-
- async tapOnConfirmModalButton() {
- await Gestures.waitAndTap(this.confirmButtonModal);
- }
-}
-
-export default new ConfirmAddAssetView();
diff --git a/e2e/pages/wallet/ImportTokenFlow/ImportTokensView.js b/e2e/pages/wallet/ImportTokenFlow/ImportTokensView.js
deleted file mode 100644
index dd0ce124227..00000000000
--- a/e2e/pages/wallet/ImportTokenFlow/ImportTokensView.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import Matchers from '../../../utils/Matchers';
-import Gestures from '../../../utils/Gestures';
-import {
- ImportTokenViewSelectorsIDs,
- ImportTokenViewSelectorsText,
-} from '../../../selectors/wallet/ImportTokenView.selectors';
-import TestHelpers from '../../../helpers';
-
-class ImportTokensView {
- get searchTokenResult() {
- return Matchers.getElementByID(ImportTokenViewSelectorsIDs.SEARCH_TOKEN_RESULT);
- }
-
- get nextButton() {
- return Matchers.getElementByID(ImportTokenViewSelectorsIDs.NEXT_BUTTON);
- }
-
- get symbolInput() {
- return Matchers.getElementByID(ImportTokenViewSelectorsIDs.SYMBOL_INPUT);
- }
-
- get tokenSymbolText() {
- return Matchers.getElementByText(ImportTokenViewSelectorsText.TOKEN_SYMBOL);
- }
-
- get addressInput() {
- return Matchers.getElementByID(ImportTokenViewSelectorsIDs.ADDRESS_INPUT);
- }
-
- get customTokenTab() {
- return Matchers.getElementByText(ImportTokenViewSelectorsText.CUSTOM_TOKEN_TAB);
- }
-
- get searchTokenBar() {
- return Matchers.getElementByID(ImportTokenViewSelectorsIDs.SEARCH_BAR);
- }
-
- async tapSymbolInput() {
- await Gestures.waitAndTap(this.symbolInput);
- }
-
- async tapTokenSymbolText() {
- await Gestures.waitAndTap(this.tokenSymbolText);
- }
-
- async scrollDownOnImportCustomTokens() {
- await Gestures.swipe(this.symbolInput, 'up', 'slow', 0.6);
- }
-
- async typeTokenAddress(address) {
- await Gestures.typeTextAndHideKeyboard(this.addressInput, address);
- }
-
- async switchToCustomTab() {
- await Gestures.waitAndTap(this.customTokenTab);
- }
-
- async searchToken(tokenName) {
- await Gestures.typeTextAndHideKeyboard(this.searchTokenBar, tokenName);
- }
-
- async tapOnToken() {
- await Gestures.TapAtIndex(this.searchTokenResult, 0);
- }
-
- async tapOnNextButton() {
- await Gestures.waitAndTap(this.nextButton);
- }
-}
-
-export default new ImportTokensView();
diff --git a/e2e/selectors/AddCustomTokenView.selectors.js b/e2e/selectors/AddCustomTokenView.selectors.js
new file mode 100644
index 00000000000..17b37bbcff5
--- /dev/null
+++ b/e2e/selectors/AddCustomTokenView.selectors.js
@@ -0,0 +1,12 @@
+import enContent from '../../locales/languages/en.json';
+
+export const AddCustomTokenViewSelectorsIDs = {
+ CANCEL_BUTTON: 'add-custom-asset-cancel-button',
+ CONFIRM_BUTTON: 'add-custom-asset-confirm-button',
+};
+
+export const AddCustomTokenViewSelectorsText = {
+ TOKEN_SYMBOL: enContent.token.token_symbol,
+ IMPORT_BUTTON: enContent.add_asset.tokens.add_token,
+ CUSTOM_TOKEN_TAB: enContent.add_asset.custom_token,
+};
diff --git a/e2e/selectors/ImportTokenView.selectors.js b/e2e/selectors/ImportTokenView.selectors.js
new file mode 100644
index 00000000000..d06bd38f110
--- /dev/null
+++ b/e2e/selectors/ImportTokenView.selectors.js
@@ -0,0 +1,13 @@
+import enContent from '../../locales/languages/en.json';
+
+export const ImportTokenViewSelectorsIDs = {
+ CONTAINER: 'searched-token-result',
+};
+
+export const ImportTokenViewSelectorsText = {
+ IMPORT_BUTTON: enContent.add_asset.tokens.add_token,
+ CANCEL_BUTTON: enContent.add_asset.tokens.cancel_add_token,
+ CONFIRM_IMPORT_TOKEN: enContent.swaps.Import,
+ CANCEL_IMPORT_TOKEN: enContent.confirmation_modal.cancel_cta,
+ CONFIRM_CANCEL_IMPORT_TOKEN: enContent.confirmation_modal.confirm_cta,
+};
diff --git a/e2e/selectors/PerformanceRegression.selectors.js b/e2e/selectors/PerformanceRegression.selectors.js
deleted file mode 100644
index a819da4cd79..00000000000
--- a/e2e/selectors/PerformanceRegression.selectors.js
+++ /dev/null
@@ -1,4 +0,0 @@
-
-export const PerformanceRegressionSelectorIDs = {
- APP_START_TIME_ID: 'app-start-time-id',
-};
diff --git a/e2e/selectors/wallet/ImportNFTView.selectors.js b/e2e/selectors/wallet/ImportNFTView.selectors.js
deleted file mode 100644
index af48fe7ce4b..00000000000
--- a/e2e/selectors/wallet/ImportNFTView.selectors.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export const NFTImportScreenSelectorsIDs = {
- CONTAINER: 'import-nft-screen',
- ADDRESS_INPUT_BOX: 'input-collectible-address',
- ADDRESS_WARNING_MESSAGE: 'collectible-address-warning',
- IDENTIFIER_WARNING_MESSAGE: 'collectible-identifier-warning',
- IDENTIFIER_INPUT_BOX: 'input-collectible-identifier',
- NEXT_BUTTON_CUSTOM_IMPORT: 'next-button-custom-import',
-};
diff --git a/e2e/selectors/wallet/ImportTokenView.selectors.js b/e2e/selectors/wallet/ImportTokenView.selectors.js
deleted file mode 100644
index 4ad9af6c348..00000000000
--- a/e2e/selectors/wallet/ImportTokenView.selectors.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import enContent from '../../../locales/languages/en.json';
-
-export const ImportTokenViewSelectorsIDs = {
- SEARCH_TOKEN_RESULT: 'searched-token-result',
- CANCEL_BUTTON: 'add-custom-asset-cancel-button',
- CONFIRM_BUTTON: 'add-custom-asset-confirm-button',
- CUSTOM_TOKEN_CONTAINER: 'add-custom-token-screen',
- ADDRESS_INPUT: 'input-token-address',
- SYMBOL_INPUT: 'input-token-symbol',
- DECIMAL_INPUT: 'input-token-decimal',
- ADDRESS_WARNING_MESSAGE: 'token-address-warning',
- PRECISION_WARNING_MESSAGE: 'token-decimals-warning',
- BACK_BUTTON: 'asset-back-button',
- ADD_CONFIRM_CUSTOM_ASSET: 'add-confirm-custom-asset',
- ADD_CANCEL_ADD_CUSTOM_ASSET_MODAL: 'add-cancel-custom-asset-modal',
- NEXT_BUTTON: 'token-import-next-button',
- SEARCH_BAR: 'input-search-asset',
-};
-
-export const ImportTokenViewSelectorsText = {
- IMPORT_BUTTON: enContent.add_asset.tokens.add_token,
- CANCEL_BUTTON: enContent.add_asset.tokens.cancel_add_token,
- CONFIRM_IMPORT_TOKEN: enContent.swaps.Import,
- CANCEL_IMPORT_TOKEN: enContent.confirmation_modal.cancel_cta,
- CONFIRM_CANCEL_IMPORT_TOKEN: enContent.confirmation_modal.confirm_cta,
- TOKEN_SYMBOL: enContent.token.token_symbol,
- CUSTOM_TOKEN_TAB: enContent.add_asset.custom_token,
-};
diff --git a/e2e/specs/assets/import-tokens.spec.js b/e2e/specs/assets/import-tokens.spec.js
index 2fea7fe9114..511a9adf1d9 100644
--- a/e2e/specs/assets/import-tokens.spec.js
+++ b/e2e/specs/assets/import-tokens.spec.js
@@ -2,7 +2,7 @@
import { SmokeAssets } from '../../tags';
import TestHelpers from '../../helpers';
import WalletView from '../../pages/wallet/WalletView';
-import ImportTokensView from '../../pages/wallet/ImportTokenFlow/ImportTokensView';
+import ImportTokensView from '../../pages/ImportTokensView';
import FixtureBuilder from '../../fixtures/fixture-builder';
import {
loadFixture,
@@ -12,7 +12,7 @@ import {
import { getFixturesServerPort } from '../../fixtures/utils';
import FixtureServer from '../../fixtures/fixture-server';
import { loginToApp } from '../../viewHelper';
-import ConfirmAddAssetView from '../../pages/wallet/ImportTokenFlow/ConfirmAddAsset';
+import ConfirmAddAssetView from '../../pages/ConfirmAddAsset';
import Assertions from '../../utils/Assertions';
const fixtureServer = new FixtureServer();
@@ -35,12 +35,15 @@ describe(SmokeAssets('Import Tokens'), () => {
it('should add a token via token autocomplete', async () => {
await WalletView.tapImportTokensButton();
- await ImportTokensView.searchToken('SNX');
+ // Search for SNX
+ await ImportTokensView.typeInTokenName('SNX');
+ await TestHelpers.delay(2000);
await ImportTokensView.tapOnToken(); // taps the first token in the returned list
+ await TestHelpers.delay(500);
await ImportTokensView.tapOnNextButton();
await TestHelpers.delay(500);
- await Assertions.checkIfVisible(ConfirmAddAssetView.container);
+ await ConfirmAddAssetView.isVisible();
await ConfirmAddAssetView.tapOnConfirmButton();
@@ -51,22 +54,25 @@ describe(SmokeAssets('Import Tokens'), () => {
it('should cancel add a token via token autocomplete', async () => {
await WalletView.tapImportTokensButton();
- await ImportTokensView.searchToken('SNX');
+ // Search for SNX
+ await ImportTokensView.typeInTokenName('SNX');
await TestHelpers.delay(2000);
- await ImportTokensView.tapOnToken();
+ await ImportTokensView.tapOnToken(); // taps the first token in the returned list
await TestHelpers.delay(500);
await ImportTokensView.tapOnNextButton();
await TestHelpers.delay(500);
- await Assertions.checkIfVisible(ConfirmAddAssetView.container);
+ await ConfirmAddAssetView.isVisible();
await ConfirmAddAssetView.tapOnCancelButton();
- await Assertions.checkIfVisible(ConfirmAddAssetView.cancelModal);
+ await ConfirmAddAssetView.cancelModalIsVisible();
+
await ConfirmAddAssetView.tapOnConfirmModalButton();
});
it('should hide token from Wallet view', async () => {
await WalletView.removeTokenFromWallet('0 SNX');
+ await TestHelpers.delay(1500);
await Assertions.checkIfNotVisible(WalletView.tokenInWallet('SNX'));
});
});
diff --git a/e2e/specs/assets/nft-details.spec.js b/e2e/specs/assets/nft-details.spec.js
index a352684c7f9..b61fa8d7868 100644
--- a/e2e/specs/assets/nft-details.spec.js
+++ b/e2e/specs/assets/nft-details.spec.js
@@ -10,7 +10,7 @@ import {
} from '../../fixtures/fixture-helper';
import { SMART_CONTRACTS } from '../../../app/util/test/smart-contracts';
import WalletView from '../../pages/wallet/WalletView';
-import ImportNFTView from '../../pages/wallet/ImportNFTFlow/ImportNFTView';
+import AddCustomTokenView from '../../pages/AddCustomTokenView';
import Assertions from '../../utils/Assertions';
import enContent from '../../../locales/languages/en.json';
@@ -45,9 +45,9 @@ describe(SmokeAssets('NFT Details page'), () => {
await WalletView.scrollDownOnNFTsTab();
// Tap on the add collectibles button
await WalletView.tapImportNFTButton();
- await Assertions.checkIfVisible(ImportNFTView.container);
- await ImportNFTView.typeInNFTAddress(nftsAddress);
- await ImportNFTView.typeInNFTIdentifier('1');
+ await AddCustomTokenView.isVisible();
+ await AddCustomTokenView.typeInNFTAddress(nftsAddress);
+ await AddCustomTokenView.typeInNFTIdentifier('1');
await Assertions.checkIfVisible(WalletView.container);
// Wait for asset to load
diff --git a/e2e/specs/quarantine/add-edit-custom-eth-mainnet.failing.js b/e2e/specs/quarantine/add-edit-custom-eth-mainnet.failing.js
new file mode 100644
index 00000000000..95fb09f997a
--- /dev/null
+++ b/e2e/specs/quarantine/add-edit-custom-eth-mainnet.failing.js
@@ -0,0 +1,115 @@
+import { Regression } from '../../tags';
+import OnboardingCarouselView from '../../pages/Onboarding/OnboardingCarouselView';
+import OnboardingView from '../../pages/Onboarding/OnboardingView';
+import Assertions from '../../utils/Assertions';
+import MetaMetricsOptIn from '../../pages/Onboarding/MetaMetricsOptInView';
+import DefaultNetworkView from '../../pages/Onboarding/DefaultNetworkView';
+import TermsOfUseModal from '../../pages/modals/TermsOfUseModal';
+import CreatePasswordView from '../../pages/Onboarding/CreatePasswordView';
+import OnboardingSuccessView from '../../pages/Onboarding/OnboardingSuccessView';
+import EnableAutomaticSecurityChecksView from '../../pages/EnableAutomaticSecurityChecksView';
+import SkipAccountSecurityModal from '../../pages/modals/SkipAccountSecurityModal';
+import WalletView from '../../pages/wallet/WalletView';
+import ProtectYourWalletView from '../../pages/Onboarding/ProtectYourWalletView';
+import NetworksView from '../../pages/Settings/NetworksView';
+import Accounts from '../../../wdio/helpers/Accounts';
+import { CustomNetworks } from '../../resources/networks.e2e';
+import TabBarComponent from '../../pages/TabBarComponent';
+import SettingsView from '../../pages/Settings/SettingsView';
+import NetworkListModal from '../../pages/modals/NetworkListModal';
+import OnboardingWizardModal from '../../pages/modals/OnboardingWizardModal';
+import ProtectYourWalletModal from '../../pages/modals/ProtectYourWalletModal';
+import ExperienceEnhancerModal from '../../pages/modals/ExperienceEnhancerModal';
+
+const validAccount = Accounts.getValidAccount();
+
+describe(Regression('Add custom default ETH Mainnet'), () => {
+ beforeAll(async () => {
+ await device.launchApp();
+ });
+
+ it('should navigate to edit custom default ETH Mainnet from Opt-In screen', async () => {
+ await OnboardingCarouselView.tapOnGetStartedButton();
+ await OnboardingView.tapCreateWallet();
+ await Assertions.checkIfVisible(MetaMetricsOptIn.container);
+ });
+
+ it('should not edit default network with invalid RPC', async () => {
+ await MetaMetricsOptIn.tapEditDefaultNetworkHere();
+ await DefaultNetworkView.typeRpcURL(
+ CustomNetworks.EthereumMainCustom.providerConfig.rpcUrlInvalid,
+ );
+ await Assertions.checkIfVisible(NetworksView.rpcWarningBanner);
+ });
+
+ it('should edit default ETH Mainnet with valid RPC', async () => {
+ await DefaultNetworkView.typeRpcURL(
+ CustomNetworks.EthereumMainCustom.providerConfig.rpcUrl,
+ );
+ await DefaultNetworkView.tapUseThisNetworkButton();
+ await Assertions.checkIfVisible(MetaMetricsOptIn.container);
+ });
+
+ it('should complete creating wallet', async () => {
+ await MetaMetricsOptIn.tapAgreeButton();
+ await TermsOfUseModal.tapScrollEndButton();
+ await TermsOfUseModal.tapAgreeCheckBox();
+ await TermsOfUseModal.tapAcceptButton();
+ await CreatePasswordView.enterPassword(validAccount.password);
+ await CreatePasswordView.reEnterPassword(validAccount.password);
+ await CreatePasswordView.tapIUnderstandCheckBox();
+ await CreatePasswordView.tapCreatePasswordButton();
+ await ProtectYourWalletView.tapOnRemindMeLaterButton();
+ await SkipAccountSecurityModal.tapIUnderstandCheckBox();
+ await SkipAccountSecurityModal.tapSkipButton();
+ await OnboardingSuccessView.tapDone();
+ await EnableAutomaticSecurityChecksView.tapNoThanks();
+ await OnboardingWizardModal.tapNoThanksButton();
+ await ExperienceEnhancerModal.tapIagree();
+ });
+
+ it('should show custom default ETH Mainnet as active', async () => {
+ await Assertions.checkIfElementToHaveText(
+ WalletView.navbarNetworkText,
+ CustomNetworks.EthereumMainCustom.providerConfig.nickname,
+ );
+ });
+
+ it('should navigate to Settings > Networks', async () => {
+ await Assertions.checkIfVisible(ProtectYourWalletModal.collapseWalletModal);
+ await ProtectYourWalletModal.tapRemindMeLaterButton();
+ await SkipAccountSecurityModal.tapIUnderstandCheckBox();
+ await SkipAccountSecurityModal.tapSkipButton();
+ await TabBarComponent.tapSettings();
+ await SettingsView.scrollToContactSupportButton();
+ await SettingsView.tapNetworks();
+ await Assertions.checkIfVisible(NetworksView.networkContainer);
+ });
+
+ it('should edit custom default mainnet and land on Wallet view', async () => {
+ await NetworksView.tapNetworkByName(
+ CustomNetworks.EthereumMainCustom.providerConfig.nickname,
+ );
+ await NetworksView.clearRpcInputBox();
+ await NetworksView.typeInRpcUrl(
+ CustomNetworks.EthereumMainCustom.providerConfig.rpcUrlAlt,
+ );
+ await NetworksView.tapSave();
+ await Assertions.checkIfElementToHaveText(
+ WalletView.navbarNetworkText,
+ CustomNetworks.Sepolia.providerConfig.nickname,
+ );
+ });
+
+ it('should show Ethereum Main Custom on added network list', async () => {
+ await WalletView.tapNetworksButtonOnNavBar();
+ await NetworkListModal.changeNetworkTo(
+ CustomNetworks.EthereumMainCustom.providerConfig.nickname,
+ true, //setting this made this step work for iOS
+ );
+ await Assertions.checkIfElementToHaveText(
+ WalletView.navbarNetworkText,
+ CustomNetworks.Sepolia.providerConfig.nickname,
+ );
+ });
+});
diff --git a/e2e/specs/quarantine/contract-nickname.failing.js b/e2e/specs/quarantine/contract-nickname.failing.js
new file mode 100644
index 00000000000..5e042bd4f6a
--- /dev/null
+++ b/e2e/specs/quarantine/contract-nickname.failing.js
@@ -0,0 +1,207 @@
+'use strict';
+import ImportWalletView from '../../pages/Onboarding/ImportWalletView';
+import OnboardingView from '../../pages/Onboarding/OnboardingView';
+import OnboardingCarouselView from '../../pages/Onboarding/OnboardingCarouselView';
+
+import ContractNickNameView from '../../pages/ContractNickNameView';
+import SendView from '../../pages/Send/SendView';
+import MetaMetricsOptIn from '../../pages/Onboarding/MetaMetricsOptInView';
+import WalletView from '../../pages/wallet/WalletView';
+import EnableAutomaticSecurityChecksView from '../../pages/EnableAutomaticSecurityChecksView';
+import LoginView from '../../pages/LoginView';
+
+import ContactsView from '../../pages/Settings/Contacts/ContactsView';
+import SettingsView from '../../pages/Settings/SettingsView';
+
+import NetworkListModal from '../../pages/modals/NetworkListModal';
+import OnboardingWizardModal from '../../pages/modals/OnboardingWizardModal';
+import NetworkEducationModal from '../../pages/modals/NetworkEducationModal';
+import SecurityAndPrivacy from '../../pages/Settings/SecurityAndPrivacy/SecurityAndPrivacyView';
+
+import TestHelpers from '../../helpers';
+import { acceptTermOfUse } from '../../viewHelper';
+import Accounts from '../../../wdio/helpers/Accounts';
+import TabBarComponent from '../../pages/TabBarComponent';
+import WalletActionsModal from '../../pages/modals/WalletActionsModal';
+import ContractApprovalModal from '../../pages/modals/ContractApprovalModal';
+import CommonView from '../../pages/CommonView';
+import Assertions from '../../utils/Assertions';
+import { CustomNetworks } from '../../resources/networks.e2e';
+
+describe('Adding Contract Nickname', () => {
+ const APPROVAL_DEEPLINK_URL =
+ 'https://metamask.app.link/send/0x326C977E6efc84E512bB9C30f76E30c160eD06FB@5/approve?address=0x178e3e6c9f547A00E33150F7104427ea02cfc747&uint256=5e8';
+ const CONTRACT_NICK_NAME_TEXT = 'Ace RoMaIn';
+
+ //FIXME Deep linking to a contract address does not work on a sim.
+
+ let validAccount;
+
+ beforeAll(() => {
+ validAccount = Accounts.getValidAccount();
+ });
+
+ beforeEach(() => {
+ jest.setTimeout(150000);
+ });
+
+ it('should import via seed phrase and validate in settings', async () => {
+ await Assertions.checkIfVisible(OnboardingCarouselView.container);
+ await OnboardingCarouselView.tapOnGetStartedButton();
+
+ await Assertions.checkIfVisible(OnboardingView.container);
+ await OnboardingView.tapImportWalletFromSeedPhrase();
+
+ await Assertions.checkIfVisible(MetaMetricsOptIn.container);
+ await MetaMetricsOptIn.tapAgreeButton();
+
+ await acceptTermOfUse();
+ await Assertions.checkIfVisible(ImportWalletView.container);
+ });
+
+ it('should attempt to import wallet with invalid secret recovery phrase', async () => {
+ await ImportWalletView.enterSecretRecoveryPhrase(validAccount.seedPhrase);
+ await ImportWalletView.enterPassword(validAccount.password);
+ await ImportWalletView.reEnterPassword(validAccount.password);
+ await Assertions.checkIfVisible(WalletView.container);
+ });
+
+ it('Should dismiss Automatic Security checks screen', async () => {
+ await TestHelpers.delay(3500);
+ await EnableAutomaticSecurityChecksView.isVisible();
+ await EnableAutomaticSecurityChecksView.tapNoThanks();
+ });
+
+ it('should dismiss the onboarding wizard', async () => {
+ // dealing with flakiness on bitrise.
+ await TestHelpers.delay(1000);
+ try {
+ await Assertions.checkIfVisible(OnboardingWizardModal.stepOneContainer);
+ await OnboardingWizardModal.tapNoThanksButton();
+ await Assertions.checkIfNotVisible(
+ OnboardingWizardModal.stepOneContainer,
+ );
+ } catch {
+ //
+ }
+ });
+
+ it('should switch to SEPOLIA', async () => {
+ await WalletView.tapNetworksButtonOnNavBar();
+ await NetworkListModal.changeNetworkTo(
+ CustomNetworks.Sepolia.providerConfig.nickname,
+ );
+ await Assertions.checkIfElementToHaveText(
+ WalletView.navbarNetworkText,
+ CustomNetworks.Sepolia.providerConfig.nickname,
+ );
+ await TestHelpers.delay(1500);
+ });
+
+ it('should dismiss network education modal', async () => {
+ await Assertions.checkIfVisible(NetworkEducationModal.container);
+ await NetworkEducationModal.tapGotItButton();
+ await Assertions.checkIfNotVisible(NetworkEducationModal.container);
+ });
+ it('should go to the Privacy and settings view', async () => {
+ await TabBarComponent.tapSettings();
+ await SettingsView.tapSecurityAndPrivacy();
+
+ await SecurityAndPrivacy.scrollToTurnOnRememberMe();
+ await TestHelpers.delay(3000);
+ });
+
+ it('should enable remember me', async () => {
+ await Assertions.checkIfToggleIsOff(SecurityAndPrivacy.rememberMeToggle);
+ await SecurityAndPrivacy.tapTurnOnRememberMeToggle();
+ await Assertions.checkIfToggleIsOn(SecurityAndPrivacy.rememberMeToggle);
+
+ await TestHelpers.delay(1500);
+ });
+
+ it('should relaunch the app then enable remember me', async () => {
+ // Relaunch app
+ await TestHelpers.relaunchApp();
+ await LoginView.isVisible();
+ await LoginView.toggleRememberMe();
+
+ await LoginView.enterPassword(validAccount.password);
+ await Assertions.checkIfVisible(WalletView.container);
+ });
+
+ it('should deep link to the approval modal', async () => {
+ await TestHelpers.openDeepLink(APPROVAL_DEEPLINK_URL);
+ await TestHelpers.delay(3000);
+ await Assertions.checkIfVisible(ContractApprovalModal.container);
+ });
+
+ it('should add a nickname to the contract', async () => {
+ await ContractApprovalModal.tapAddNickName();
+
+ await ContractNickNameView.isVisible();
+ await ContractNickNameView.typeContractNickName(CONTRACT_NICK_NAME_TEXT);
+ await ContractNickNameView.isContractNickNameInInputBoxVisible(
+ CONTRACT_NICK_NAME_TEXT,
+ );
+ await ContractNickNameView.tapConfirmButton();
+ });
+
+ it('should edit the contract nickname', async () => {
+ await ContractApprovalModal.tapEditNickName();
+
+ await ContractNickNameView.isContractNickNameInInputBoxVisible(
+ CONTRACT_NICK_NAME_TEXT,
+ );
+ await ContractNickNameView.clearNickName();
+ await ContractNickNameView.typeContractNickName('Ace');
+ await ContractNickNameView.tapConfirmButton();
+
+ await ContractApprovalModal.tapToCopyContractAddress();
+ await ContractApprovalModal.tapRejectButton();
+ });
+
+ it('should verify contract does not appear in contacts view', async () => {
+ // Check that we are on the wallet screen
+ await Assertions.checkIfVisible(WalletView.container);
+ await TabBarComponent.tapSettings();
+ await SettingsView.tapContacts();
+
+ await Assertions.checkIfVisible(ContactsView.container);
+ await ContactsView.isContactAliasVisible('Ace');
+ });
+
+ it('should return to the send view', async () => {
+ // Open Drawer
+ await CommonView.tapBackButton();
+
+ await TabBarComponent.tapActions();
+ await WalletActionsModal.tapSendButton();
+ // Make sure view with my accounts visible
+ await Assertions.checkIfVisible(SendView.CurrentAccountElement);
+ });
+
+ it('should verify the contract nickname does not appear in send flow', async () => {
+ await Assertions.checkIfTextIsNotDisplayed('Ace');
+ });
+
+ it('should deep link to the approval modal and approve transaction', async () => {
+ await TestHelpers.openDeepLink(APPROVAL_DEEPLINK_URL);
+ await TestHelpers.delay(3000);
+ await Assertions.checkIfVisible(ContractApprovalModal.container);
+
+ await ContractApprovalModal.tapApproveButton();
+ await Assertions.checkIfNotVisible(ContractApprovalModal.container);
+ });
+
+ it('should go to the send view again', async () => {
+ await TabBarComponent.tapActions();
+ await WalletActionsModal.tapSendButton();
+ // Make sure view with my accounts visible
+ //TODO: Update SendView.isMyAccountsVisible, this method does not exist
+ //await SendView.isMyAccountsVisible();
+ });
+
+ it('should verify the contract nickname does not appear in recents', async () => {
+ await Assertions.checkIfTextIsNotDisplayed('Ace');
+ });
+});
diff --git a/e2e/specs/quarantine/import-nft.failing.js b/e2e/specs/quarantine/import-nft.failing.js
index d609e2b95db..004ffef6158 100644
--- a/e2e/specs/quarantine/import-nft.failing.js
+++ b/e2e/specs/quarantine/import-nft.failing.js
@@ -2,7 +2,7 @@
import { SmokeAssets } from '../../tags';
import Assertions from '../../utils/Assertions';
import WalletView from '../../pages/wallet/WalletView';
-import ImportNFTView from '../../pages/wallet/ImportNFTFlow/ImportNFTView';
+import AddCustomTokenView from '../../pages/AddCustomTokenView';
import { loginToApp } from '../../viewHelper';
import {
withFixtures,
@@ -12,7 +12,7 @@ import { SMART_CONTRACTS } from '../../../app/util/test/smart-contracts';
import FixtureBuilder from '../../fixtures/fixture-builder';
describe(SmokeAssets('Import NFT'), () => {
- beforeAll(() => {
+ beforeAll(async () => {
jest.setTimeout(150000);
});
@@ -38,16 +38,16 @@ describe(SmokeAssets('Import NFT'), () => {
await WalletView.scrollDownOnNFTsTab();
// Tap on the add collectibles button
await WalletView.tapImportNFTButton();
- await Assertions.checkIfVisible(ImportNFTView.container);
+ await AddCustomTokenView.isVisible();
// Input incorrect contract address
- await ImportNFTView.typeInNFTAddress('1234');
- await ImportNFTView.typeInNFTIdentifier('');
- await Assertions.checkIfVisible(ImportNFTView.addressWarningMessage);
- //await ImportNFTView.tapBackButton();
+ await AddCustomTokenView.typeInNFTAddress('1234');
+ await AddCustomTokenView.typeInNFTIdentifier('');
+ await AddCustomTokenView.isNFTAddressWarningVisible();
+ await AddCustomTokenView.tapBackButton();
await WalletView.tapImportNFTButton();
- await Assertions.checkIfVisible(ImportNFTView.container);
- await ImportNFTView.typeInNFTAddress(erc1155ContractAddress);
- await ImportNFTView.typeInNFTIdentifier('1');
+ await AddCustomTokenView.isVisible();
+ await AddCustomTokenView.typeInNFTAddress(erc1155ContractAddress);
+ await AddCustomTokenView.typeInNFTIdentifier('1');
await Assertions.checkIfVisible(WalletView.container);
// Wait for asset to load
await Assertions.checkIfVisible(WalletView.nftInWallet('TestDappNFTs'));
diff --git a/e2e/specs/quarantine/swap-token-chart.failing.js b/e2e/specs/swaps/swap-token-chart.spec.js
similarity index 95%
rename from e2e/specs/quarantine/swap-token-chart.failing.js
rename to e2e/specs/swaps/swap-token-chart.spec.js
index a3ef99be5e6..d6d6bbbf0e9 100644
--- a/e2e/specs/quarantine/swap-token-chart.failing.js
+++ b/e2e/specs/swaps/swap-token-chart.spec.js
@@ -89,18 +89,13 @@ describe(Regression('Swap from Token view'), () => {
await TokenOverview.tapBackButton();
await TabBarComponent.tapActivity();
await Assertions.checkIfVisible(ActivitiesView.title);
- await Assertions.checkIfVisible(
- ActivitiesView.swapActivity(sourceTokenSymbol, destTokenSymbol),
- );
+ await Assertions.checkIfVisible(ActivitiesView.swapActivity(sourceTokenSymbol, destTokenSymbol));
await ActivitiesView.tapOnSwapActivity(sourceTokenSymbol, destTokenSymbol);
try {
await Assertions.checkIfVisible(DetailsModal.title);
} catch (e) {
- await ActivitiesView.tapOnSwapActivity(
- sourceTokenSymbol,
- destTokenSymbol,
- );
+ await ActivitiesView.tapOnSwapActivity(sourceTokenSymbol, destTokenSymbol);
await Assertions.checkIfVisible(DetailsModal.title);
}
diff --git a/e2e/specs/wallet/send-ERC-token.spec.js b/e2e/specs/wallet/send-ERC-token.spec.js
index 86d3a494ab3..baf4aacd48e 100644
--- a/e2e/specs/wallet/send-ERC-token.spec.js
+++ b/e2e/specs/wallet/send-ERC-token.spec.js
@@ -3,15 +3,15 @@ import { SmokeCore } from '../../tags';
import TestHelpers from '../../helpers';
import WalletView from '../../pages/wallet/WalletView';
import NetworkEducationModal from '../../pages/modals/NetworkEducationModal';
+import AddCustomTokenView from '../../pages/AddCustomTokenView';
import AmountView from '../../pages/Send/AmountView';
import SendView from '../../pages/Send/SendView';
import { importWalletWithRecoveryPhrase } from '../../viewHelper';
import TransactionConfirmationView from '../../pages/Send/TransactionConfirmView';
import NetworkListModal from '../../pages/modals/NetworkListModal';
import TokenOverview from '../../pages/TokenOverview';
-import ConfirmAddAssetView from '../../pages/wallet/ImportTokenFlow/ConfirmAddAsset';
-import ImportTokensView from '../../pages/wallet/ImportTokenFlow/ImportTokensView';
import Assertions from '../../utils/Assertions';
+import ConfirmAddAssetView from '../../pages/ConfirmAddAsset';
import { CustomNetworks } from '../../resources/networks.e2e';
const TOKEN_ADDRESS = '0x779877A7B0D9E8603169DdbD7836e478b4624789';
@@ -45,13 +45,16 @@ describe(SmokeCore('Send ERC Token'), () => {
it('should Import custom token', async () => {
await WalletView.tapImportTokensButton();
- await ImportTokensView.switchToCustomTab();
- await ImportTokensView.typeTokenAddress(TOKEN_ADDRESS);
- await ImportTokensView.tapSymbolInput();
- await ImportTokensView.tapTokenSymbolText();
- await ImportTokensView.scrollDownOnImportCustomTokens();
- await ImportTokensView.tapOnNextButton();
- await Assertions.checkIfVisible(ConfirmAddAssetView.container);
+ await AddCustomTokenView.switchToCustomTab();
+ await AddCustomTokenView.typeTokenAddress(TOKEN_ADDRESS);
+ await TestHelpers.delay(1000);
+ await AddCustomTokenView.tapTokenSymbolInputBox();
+ await TestHelpers.delay(1000);
+ await AddCustomTokenView.tapTokenSymbolText();
+ await AddCustomTokenView.scrollDownOnImportCustomTokens();
+ await AddCustomTokenView.tapNextButton();
+ await TestHelpers.delay(500);
+ await ConfirmAddAssetView.isVisible();
await ConfirmAddAssetView.tapOnConfirmButton();
await Assertions.checkIfVisible(WalletView.container);
});
diff --git a/e2e/utils/Matchers.js b/e2e/utils/Matchers.js
index ea40255afb9..50896f66702 100644
--- a/e2e/utils/Matchers.js
+++ b/e2e/utils/Matchers.js
@@ -1,4 +1,4 @@
-import { web, system } from 'detox';
+import { web } from 'detox';
/**
* Utility class for matching (locating) UI elements
@@ -153,17 +153,6 @@ class Matchers {
static async getIdentifier(selectorString) {
return by.id(selectorString);
}
-
-
- /**
- * Get system dialogs in the system-level (e.g. permissions, alerts, etc.), by text.
- *
- * @param {string} text - Match elements with the specified text
- * @return {Promise} - Resolves to the located element
- */
- static async getSystemElementByText(text) {
- return system.element(by.system.label(text));
- }
}
export default Matchers;
diff --git a/e2e/viewHelper.js b/e2e/viewHelper.js
index ad7438dadc9..3b75cd49de4 100644
--- a/e2e/viewHelper.js
+++ b/e2e/viewHelper.js
@@ -1,7 +1,6 @@
'use strict';
import EnableAutomaticSecurityChecksView from './pages/EnableAutomaticSecurityChecksView';
-import EnableDeviceNotificationsAlert from './pages/EnableDeviceNotificationsAlert';
import ImportWalletView from './pages/Onboarding/ImportWalletView';
import MetaMetricsOptIn from './pages/Onboarding/MetaMetricsOptInView';
import NetworkEducationModal from './pages/modals/NetworkEducationModal';
@@ -69,21 +68,6 @@ have to have all these workarounds in the tests
}
};
-export const skipNotificationsDeviceSettings = async () => {
-
- await TestHelpers.delay(1000);
-
- try {
- await Assertions.checkIfVisible(EnableDeviceNotificationsAlert.stepOneContainer);
- await EnableDeviceNotificationsAlert.tapOnNotEnableDeviceNotificationsButton();
- await Assertions.checkIfNotVisible(EnableDeviceNotificationsAlert.stepOneContainer);
- } catch {
- /* eslint-disable no-console */
-
- console.log('The notification device alert modal is not visible');
- }
-};
-
export const importWalletWithRecoveryPhrase = async () => {
// tap on import seed phrase button
await Assertions.checkIfVisible(OnboardingCarouselView.container);
@@ -99,13 +83,12 @@ export const importWalletWithRecoveryPhrase = async () => {
await ImportWalletView.enterPassword(validAccount.password);
await ImportWalletView.reEnterPassword(validAccount.password);
+ // Should dismiss Automatic Security checks screen
await TestHelpers.delay(3500);
await OnboardingSuccessView.tapDone();
- //'Should dismiss Enable device Notifications checks alert'
- await this.skipNotificationsDeviceSettings();
- // Should dismiss Automatic Security checks screen
await EnableAutomaticSecurityChecksView.isVisible();
await EnableAutomaticSecurityChecksView.tapNoThanks();
+
// should dismiss the onboarding wizard
// dealing with flakiness on bitrise.
await this.closeOnboardingModals();
@@ -137,11 +120,9 @@ export const CreateNewWallet = async () => {
await device.enableSynchronization();
await Assertions.checkIfVisible(WalletView.container);
+ //'Should dismiss Automatic Security checks screen'
await TestHelpers.delay(3500);
await OnboardingSuccessView.tapDone();
- //'Should dismiss Enable device Notifications checks alert'
- await this.skipNotificationsDeviceSettings();
- //'Should dismiss Automatic Security checks screen'
await EnableAutomaticSecurityChecksView.isVisible();
await EnableAutomaticSecurityChecksView.tapNoThanks();
diff --git a/index.js b/index.js
index ece1f59ea50..f24e95556c6 100644
--- a/index.js
+++ b/index.js
@@ -14,11 +14,15 @@ import * as Sentry from '@sentry/react-native'; // eslint-disable-line import/no
import { setupSentry } from './app/util/sentry/utils';
setupSentry();
+import notifee, { EventType } from '@notifee/react-native';
+
import { AppRegistry, LogBox } from 'react-native';
import Root from './app/components/Views/Root';
import { name } from './app.json';
import { isTest } from './app/util/test/utils.js';
+import NotificationManager from './app/core/NotificationManager';
+import { isNotificationsFeatureEnabled } from './app/util/notifications';
import { Performance } from './app/core/Performance';
Performance.setupPerformanceObservers();
@@ -81,6 +85,18 @@ if (IGNORE_BOXLOGS_DEVELOPMENT === 'true') {
LogBox.ignoreAllLogs();
}
+isNotificationsFeatureEnabled() &&
+ notifee.onBackgroundEvent(async ({ type, detail }) => {
+ const { notification, pressAction } = detail;
+
+ if (type === EventType.ACTION_PRESS && pressAction.id === 'mark-as-read') {
+ await notifee.decrementBadgeCount(1);
+ await notifee.cancelNotification(notification.id);
+ } else {
+ await NotificationManager.onMessageReceived(notification);
+ }
+ });
+
/* Uncomment and comment regular registration below */
// import Storybook from './.storybook';
// AppRegistry.registerComponent(name, () => Storybook);
diff --git a/ios/Gemfile b/ios/Gemfile
index 3c02108f3ce..1afd2cce673 100644
--- a/ios/Gemfile
+++ b/ios/Gemfile
@@ -1,10 +1,7 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
-# Recommended to use http://rbenv.org/ to install and use this version
-ruby '>= 3.1.5'
+source "https://rubygems.org"
-# Allow minor version updates up to but excluding 2.0.0
-gem 'cocoapods', '~> 1.12'
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-# Allow all version updates up to but excluding 7.1.0
-gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
+# gem "rails"
diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj
index 33f3d02a0fe..18fcb36ea00 100644
--- a/ios/MetaMask.xcodeproj/project.pbxproj
+++ b/ios/MetaMask.xcodeproj/project.pbxproj
@@ -1273,7 +1273,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1432;
+ CURRENT_PROJECT_VERSION = 1441;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1310,7 +1310,7 @@
"${inherited}",
);
LLVM_LTO = YES;
- MARKETING_VERSION = 7.31.0;
+ MARKETING_VERSION = 7.32.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
@@ -1338,7 +1338,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
- CURRENT_PROJECT_VERSION = 1432;
+ CURRENT_PROJECT_VERSION = 1441;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
@@ -1373,7 +1373,7 @@
"${inherited}",
);
LLVM_LTO = YES;
- MARKETING_VERSION = 7.31.0;
+ MARKETING_VERSION = 7.32.0;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
@@ -1401,7 +1401,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1432;
+ CURRENT_PROJECT_VERSION = 1441;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1434,7 +1434,7 @@
);
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
LLVM_LTO = YES;
- MARKETING_VERSION = 7.31.0;
+ MARKETING_VERSION = 7.32.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
@@ -1462,7 +1462,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
- CURRENT_PROJECT_VERSION = 1432;
+ CURRENT_PROJECT_VERSION = 1441;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
@@ -1493,7 +1493,7 @@
);
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
LLVM_LTO = YES;
- MARKETING_VERSION = 7.31.0;
+ MARKETING_VERSION = 7.32.0;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
@@ -1555,7 +1555,11 @@
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "$(inherited)";
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
- OTHER_LDFLAGS = "$(inherited)";
+ OTHER_LDFLAGS = (
+ "$(inherited)",
+ "-Wl",
+ "-ld_classic",
+ );
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
};
@@ -1599,7 +1603,11 @@
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = "$(inherited)";
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
- OTHER_LDFLAGS = "$(inherited)";
+ OTHER_LDFLAGS = (
+ "$(inherited)",
+ "-Wl",
+ "-ld_classic",
+ );
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
@@ -1616,7 +1624,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1432;
+ CURRENT_PROJECT_VERSION = 1441;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1653,7 +1661,7 @@
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
);
LLVM_LTO = YES;
- MARKETING_VERSION = 7.31.0;
+ MARKETING_VERSION = 7.32.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"$(inherited)",
@@ -1684,7 +1692,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
- CURRENT_PROJECT_VERSION = 1432;
+ CURRENT_PROJECT_VERSION = 1441;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
@@ -1719,7 +1727,7 @@
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
);
LLVM_LTO = YES;
- MARKETING_VERSION = 7.31.0;
+ MARKETING_VERSION = 7.32.0;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = (
"$(inherited)",
diff --git a/ios/Podfile b/ios/Podfile
index 759ce5f2e02..d9ae91f6b43 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -97,8 +97,10 @@ def common_target_logic
pod 'Permission-BluetoothPeripheral', :path => '../node_modules/react-native-permissions/ios/BluetoothPeripheral'
pod 'GzipSwift'
- # Pod for fixing react-native-quick-crypto issue: https://github.com/margelo/react-native-quick-crypto/issues/244
- pod "OpenSSL-Universal", "= 1.1.1100"
+ # Adding OpenSSL-Universal to fix build issues in react-native-quick-crypto
+ # Ref: https://github.com/margelo/react-native-quick-crypto/issues/121
+ # Ref: https://stackoverflow.com/questions/29082174/ios-xcode-build-failing-due-to-openssl/76455587#76455587
+ pod 'OpenSSL-Universal', :modular_headers => true, :configurations => ['Release']
end
target 'MetaMask' do
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index fa5cb9cc045..de82cd678de 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -15,18 +15,18 @@ PODS:
- React-Core (= 0.72.15)
- React-jsi (= 0.72.15)
- ReactCommon/turbomodule/core (= 0.72.15)
- - Firebase (10.29.0):
- - Firebase/Core (= 10.29.0)
- - Firebase/Core (10.29.0):
+ - Firebase (10.27.0):
+ - Firebase/Core (= 10.27.0)
+ - Firebase/Core (10.27.0):
- Firebase/CoreOnly
- - FirebaseAnalytics (~> 10.29.0)
- - Firebase/CoreOnly (10.29.0):
- - FirebaseCore (= 10.29.0)
- - Firebase/Messaging (10.29.0):
+ - FirebaseAnalytics (~> 10.27.0)
+ - Firebase/CoreOnly (10.27.0):
+ - FirebaseCore (= 10.27.0)
+ - Firebase/Messaging (10.27.0):
- Firebase/CoreOnly
- - FirebaseMessaging (~> 10.29.0)
- - FirebaseAnalytics (10.29.0):
- - FirebaseAnalytics/AdIdSupport (= 10.29.0)
+ - FirebaseMessaging (~> 10.27.0)
+ - FirebaseAnalytics (10.27.0):
+ - FirebaseAnalytics/AdIdSupport (= 10.27.0)
- FirebaseCore (~> 10.0)
- FirebaseInstallations (~> 10.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
@@ -34,29 +34,29 @@ PODS:
- GoogleUtilities/Network (~> 7.11)
- "GoogleUtilities/NSData+zlib (~> 7.11)"
- nanopb (< 2.30911.0, >= 2.30908.0)
- - FirebaseAnalytics/AdIdSupport (10.29.0):
+ - FirebaseAnalytics/AdIdSupport (10.27.0):
- FirebaseCore (~> 10.0)
- FirebaseInstallations (~> 10.0)
- - GoogleAppMeasurement (= 10.29.0)
+ - GoogleAppMeasurement (= 10.27.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
- GoogleUtilities/MethodSwizzler (~> 7.11)
- GoogleUtilities/Network (~> 7.11)
- "GoogleUtilities/NSData+zlib (~> 7.11)"
- nanopb (< 2.30911.0, >= 2.30908.0)
- - FirebaseCore (10.29.0):
+ - FirebaseCore (10.27.0):
- FirebaseCoreInternal (~> 10.0)
- GoogleUtilities/Environment (~> 7.12)
- GoogleUtilities/Logger (~> 7.12)
- - FirebaseCoreExtension (10.29.0):
+ - FirebaseCoreExtension (10.28.0):
- FirebaseCore (~> 10.0)
- - FirebaseCoreInternal (10.29.0):
+ - FirebaseCoreInternal (10.28.0):
- "GoogleUtilities/NSData+zlib (~> 7.8)"
- - FirebaseInstallations (10.29.0):
+ - FirebaseInstallations (10.28.0):
- FirebaseCore (~> 10.0)
- GoogleUtilities/Environment (~> 7.8)
- GoogleUtilities/UserDefaults (~> 7.8)
- PromisesObjC (~> 2.1)
- - FirebaseMessaging (10.29.0):
+ - FirebaseMessaging (10.27.0):
- FirebaseCore (~> 10.0)
- FirebaseInstallations (~> 10.0)
- GoogleDataTransport (~> 9.3)
@@ -125,21 +125,21 @@ PODS:
- FlipperKit/FlipperKitNetworkPlugin
- fmt (6.2.1)
- glog (0.3.5)
- - GoogleAppMeasurement (10.29.0):
- - GoogleAppMeasurement/AdIdSupport (= 10.29.0)
+ - GoogleAppMeasurement (10.27.0):
+ - GoogleAppMeasurement/AdIdSupport (= 10.27.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
- GoogleUtilities/MethodSwizzler (~> 7.11)
- GoogleUtilities/Network (~> 7.11)
- "GoogleUtilities/NSData+zlib (~> 7.11)"
- nanopb (< 2.30911.0, >= 2.30908.0)
- - GoogleAppMeasurement/AdIdSupport (10.29.0):
- - GoogleAppMeasurement/WithoutAdIdSupport (= 10.29.0)
+ - GoogleAppMeasurement/AdIdSupport (10.27.0):
+ - GoogleAppMeasurement/WithoutAdIdSupport (= 10.27.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
- GoogleUtilities/MethodSwizzler (~> 7.11)
- GoogleUtilities/Network (~> 7.11)
- "GoogleUtilities/NSData+zlib (~> 7.11)"
- nanopb (< 2.30911.0, >= 2.30908.0)
- - GoogleAppMeasurement/WithoutAdIdSupport (10.29.0):
+ - GoogleAppMeasurement/WithoutAdIdSupport (10.27.0):
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
- GoogleUtilities/MethodSwizzler (~> 7.11)
- GoogleUtilities/Network (~> 7.11)
@@ -200,9 +200,9 @@ PODS:
- lottie-react-native (5.1.5):
- lottie-ios (~> 3.4.0)
- React-Core
- - MMKV (1.3.9):
- - MMKVCore (~> 1.3.9)
- - MMKVCore (1.3.9)
+ - MMKV (1.3.5):
+ - MMKVCore (~> 1.3.5)
+ - MMKVCore (1.3.5)
- MultiplatformBleAdapter (0.2.0)
- nanopb (2.30910.0):
- nanopb/decode (= 2.30910.0)
@@ -532,8 +532,6 @@ PODS:
- React-Core
- react-native-cookies (6.2.1):
- React-Core
- - react-native-fast-crypto (2.2.0):
- - React
- react-native-flipper (0.263.0):
- React-Core
- react-native-get-random-values (1.8.0):
@@ -708,11 +706,11 @@ PODS:
- React
- RNDeviceInfo (9.0.2):
- React-Core
- - RNFBApp (20.5.0):
- - Firebase/CoreOnly (= 10.29.0)
+ - RNFBApp (20.1.0):
+ - Firebase/CoreOnly (= 10.27.0)
- React-Core
- - RNFBMessaging (20.5.0):
- - Firebase/Messaging (= 10.29.0)
+ - RNFBMessaging (20.1.0):
+ - Firebase/Messaging (= 10.27.0)
- FirebaseCoreExtension
- React-Core
- RNFBApp
@@ -726,10 +724,10 @@ PODS:
- React-Core
- RNKeychain (8.0.0):
- React-Core
- - RNNotifee (9.0.2):
+ - RNNotifee (7.8.2):
- React-Core
- - RNNotifee/NotifeeCore (= 9.0.2)
- - RNNotifee/NotifeeCore (9.0.2):
+ - RNNotifee/NotifeeCore (= 7.8.2)
+ - RNNotifee/NotifeeCore (7.8.2):
- React-Core
- RNOS (1.2.6):
- React
@@ -825,6 +823,7 @@ DEPENDENCIES:
- GzipSwift
- lottie-ios (from `../node_modules/lottie-ios`)
- lottie-react-native (from `../node_modules/lottie-react-native`)
+ - OpenSSL-Universal
- OpenSSL-Universal (= 1.1.1100)
- Permission-BluetoothPeripheral (from `../node_modules/react-native-permissions/ios/BluetoothPeripheral`)
- RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
@@ -855,7 +854,6 @@ DEPENDENCIES:
- react-native-camera (from `../node_modules/react-native-camera`)
- "react-native-compat (from `../node_modules/@walletconnect/react-native-compat`)"
- "react-native-cookies (from `../node_modules/@react-native-cookies/cookies`)"
- - react-native-fast-crypto (from `../node_modules/react-native-fast-crypto`)
- react-native-flipper (from `../node_modules/react-native-flipper`)
- react-native-get-random-values (from `../node_modules/react-native-get-random-values`)
- react-native-gzip (from `../node_modules/react-native-gzip`)
@@ -1031,8 +1029,6 @@ EXTERNAL SOURCES:
:path: "../node_modules/@walletconnect/react-native-compat"
react-native-cookies:
:path: "../node_modules/@react-native-cookies/cookies"
- react-native-fast-crypto:
- :path: "../node_modules/react-native-fast-crypto"
react-native-flipper:
:path: "../node_modules/react-native-flipper"
react-native-get-random-values:
@@ -1174,13 +1170,13 @@ SPEC CHECKSUMS:
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
FBLazyVector: 25cbffbaec517695d376ab4bc428948cd0f08088
FBReactNativeSpec: e03b22fbf7017a6f76641ea4472e73c915dcdda7
- Firebase: cec914dab6fd7b1bd8ab56ea07ce4e03dd251c2d
- FirebaseAnalytics: 23717de130b779aa506e757edb9713d24b6ffeda
- FirebaseCore: 30e9c1cbe3d38f5f5e75f48bfcea87d7c358ec16
- FirebaseCoreExtension: 705ca5b14bf71d2564a0ddc677df1fc86ffa600f
- FirebaseCoreInternal: df84dd300b561c27d5571684f389bf60b0a5c934
- FirebaseInstallations: 913cf60d0400ebd5d6b63a28b290372ab44590dd
- FirebaseMessaging: 7b5d8033e183ab59eb5b852a53201559e976d366
+ Firebase: 26b040b20866a55f55eb3611b9fcf3ae64816b86
+ FirebaseAnalytics: f9211b719db260cc91aebee8bb539cb367d0dfd1
+ FirebaseCore: a2b95ae4ce7c83ceecfbbbe3b6f1cddc7415a808
+ FirebaseCoreExtension: f63147b723e2a700fe0f34ec6fb7f358d6fe83e0
+ FirebaseCoreInternal: 58d07f1362fddeb0feb6a857d1d1d1c5e558e698
+ FirebaseInstallations: 60c1d3bc1beef809fd1ad1189a8057a040c59f2e
+ FirebaseMessaging: 585984d0a1df120617eb10b44cad8968b859815e
Flipper: 6edb735e6c3e332975d1b17956bcc584eccf5818
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
@@ -1191,7 +1187,7 @@ SPEC CHECKSUMS:
FlipperKit: 2efad7007d6745a3f95e4034d547be637f89d3f6
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
- GoogleAppMeasurement: f9de05ee17401e3355f68e8fc8b5064d429f5918
+ GoogleAppMeasurement: f65fc137531af9ad647f1c0a42f3b6a4d3a98049
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
GZIP: 3c0abf794bfce8c7cb34ea05a1837752416c8868
@@ -1199,8 +1195,8 @@ SPEC CHECKSUMS:
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
lottie-ios: 016449b5d8be0c3dcbcfa0a9988469999cd04c5d
lottie-react-native: 3e722c63015fdb9c27638b0a77969fc412067c18
- MMKV: 817ba1eea17421547e01e087285606eb270a8dcb
- MMKVCore: af055b00e27d88cd92fad301c5fecd1ff9b26dd9
+ MMKV: 506311d0494023c2f7e0b62cc1f31b7370fa3cfb
+ MMKVCore: 9e2e5fd529b64a9fe15f1a7afb3d73b2e27b4db9
MultiplatformBleAdapter: b1fddd0d499b96b607e00f0faa8e60648343dc1d
nanopb: 438bc412db1928dac798aa6fd75726007be04262
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
@@ -1232,7 +1228,6 @@ SPEC CHECKSUMS:
react-native-camera: b8cc03e2feec0c04403d0998e37cf519d8fd4c6f
react-native-compat: 8b6a38155e778a20a008aea837efd00e099b6fe8
react-native-cookies: f54fcded06bb0cda05c11d86788020b43528a26c
- react-native-fast-crypto: 5943c42466b86ad70be60d3a5f64bd22251e5d9e
react-native-flipper: 6cfd5991388121f7f96fc5171b93380f97ebb3c6
react-native-get-random-values: a6ea6a8a65dc93e96e24a11105b1a9c8cfe1d72a
react-native-gzip: c5e87ee9e359f02350e3a2ee52eb35eddc398868
@@ -1277,14 +1272,14 @@ SPEC CHECKSUMS:
RNDateTimePicker: 4f3c4dbd4f908be32ec8c93f086e8924bd4a2e07
RNDefaultPreference: 2f8d6d54230edbd78708ada8d63bb275e5a8415b
RNDeviceInfo: 1e3f62b9ec32f7754fac60bd06b8f8a27124e7f0
- RNFBApp: 5f87753a8d8b37d229adf85cd0ff37709ffdf008
- RNFBMessaging: 3fa1114c0868dd21f20dfe186adf42297ea316b1
+ RNFBApp: 1ae7462cddf74a49df206d3418bc0170f8fa53e5
+ RNFBMessaging: 85f661b9f16e2b081e6809ef63d3daa4458b9042
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
RNI18n: e2f7e76389fcc6e84f2c8733ea89b92502351fd8
RNInAppBrowser: e36d6935517101ccba0e875bac8ad7b0cb655364
RNKeychain: 4f63aada75ebafd26f4bc2c670199461eab85d94
- RNNotifee: 2b7df6e32a9cc24b9af6b410fa7db1cd2f411d6d
+ RNNotifee: 8e2d3df3f0e9ce8f5d1fe4c967431138190b6175
RNOS: 6f2f9a70895bbbfbdad7196abd952e7b01d45027
RNPermissions: 4e3714e18afe7141d000beae3755e5b5fb2f5e05
RNReanimated: f8379347f71248607d530a21e31e4140c5910c25
@@ -1302,6 +1297,6 @@ SPEC CHECKSUMS:
Yoga: 6f5ab94cd8b1ecd04b6e973d0bc583ede2a598cc
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
-PODFILE CHECKSUM: 876298d4a106643492005466f7a314cd08711f4d
+PODFILE CHECKSUM: 3514934ac1830af4ca844ba018f38720a48d006b
COCOAPODS: 1.15.2
diff --git a/jest.config.js b/jest.config.js
index 658210746e1..c8c82e0f59a 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -8,8 +8,6 @@ process.env.MM_FOX_CODE = 'EXAMPLE_FOX_CODE';
process.env.SECURITY_ALERTS_API_ENABLED = 'true';
process.env.SECURITY_ALERTS_API_URL = 'https://example.com';
-process.env.REDESIGNED_SIGNATURE_REQUEST = 'true';
-
process.env.LAUNCH_DARKLY_URL =
'https://client-config.dev-api.cx.metamask.io/v1';
diff --git a/locales/languages/en.json b/locales/languages/en.json
index 055b431b4f2..0ca51057fb8 100644
--- a/locales/languages/en.json
+++ b/locales/languages/en.json
@@ -673,7 +673,6 @@
"receive": "RECEIVE"
},
"accounts": {
- "snap_account_tag": "Snaps (Beta)",
"create_new_account": "Create a new account",
"import_account": "Import an account",
"connect_hardware": "Connect hardware wallet",
@@ -948,7 +947,7 @@
"invalid_number_range": "Invalid number. Enter a number between 1 and %{maxSafeChainId}",
"hide_zero_balance_tokens_title": "Hide Tokens Without Balance",
"hide_zero_balance_tokens_desc": "Prevents tokens with no balance from displaying in your token listing.",
- "token_detection_title": "Autodetect tokens",
+ "token_detection_title": "Enhanced Token Detection",
"token_detection_description": "We use third-party APIs to detect and display new tokens sent to your wallet. Turn off if you don’t want the app to pull data from those services.",
"theme_button_text": "Change Theme",
"theme_title": "Theme ({{theme}})",
@@ -1060,7 +1059,7 @@
"snap_getBip32PublicKey": "View your public key for {{protocol}}",
"snap_getBip44Entropy": "Control your {{protocol}} accounts and assets",
"snap_getEntropy": "Derive arbitrary keys unique to this snap",
- "endowment:keyring": "Allow requests for adding and controlling Ethereum accounts",
+ "endowment:keyring": "endowment:keyring",
"wallet_snap": "Connect to {{otherSnapName}}",
"endowment:webassembly": "Support for WebAssembly",
"endowment:ethereum-provider": "Access the Ethereum provider",
@@ -1068,8 +1067,7 @@
"snap_getLocale": "See your preferred language",
"endowment:caveat:transaction-origin": "See the origins of websites that suggest transactions",
"endowment:extend-runtime": "Extend runtime",
- "snap_dialog": "Display custom dialogs",
- "snap_manageAccounts": "Add and control Ethereum accounts"
+ "snap_dialog": "Display custom dialogs"
}
}
},
@@ -1805,6 +1803,17 @@
"edit": "Edit",
"cancel": "Cancel"
},
+ "permissions": {
+ "title_this_site_wants_to": "This site wants to:",
+ "title_dapp_url_wants_to": "{{dappUrl}} wants to:",
+ "title_dapp_url_has_approval_to": "{{dappUrl}} has approval to:",
+ "use_enabled_networks": "Use your enabled networks",
+ "wants_to_see_your_accounts": "See your accounts and suggest transactions",
+ "requesting_for": "Requesting for ",
+ "manage_permissions": "Manage Permissions",
+ "edit": "Edit",
+ "cancel": "Cancel"
+ },
"select": {
"cancel": "Cancel",
"done": "Done"
@@ -2067,7 +2076,6 @@
"back_to_safety": "Back to safety"
},
"notifications": {
- "timeout": "Timeout",
"no_date": "Unknown",
"yesterday": "Yesterday",
"staked": "Staked",
@@ -3221,6 +3229,7 @@
"ledger_legacy_label": " (legacy)",
"blind_sign_error": "Blind signing error",
"blind_sign_error_message": "Blind signing is not enabled on your Ledger device. Please enable it in the settings."
+
},
"account_actions": {
"edit_name": "Edit account name",
@@ -3276,10 +3285,6 @@
"stake": {
"stake": "Stake",
"stake_eth": "Stake ETH",
- "staked_ethereum": "Staked Ethereum",
- "unstake": "Unstake",
- "stake_more": "Stake more",
- "claim": "Claim",
"your_earnings": "Your earnings",
"annual_rate": "Annual rate",
"lifetime_rewards": "Lifetime rewards",
@@ -3292,49 +3297,7 @@
"enter_amount": "Enter amount",
"review": "Review",
"not_enough_eth": "Not enough ETH",
- "balance":"Balance",
- "stake_eth_and_earn":"Stake ETH and earn",
- "stake_any_amount_of_eth":"Stake any amount of ETH",
- "no_minimum_required":"No minimum required.",
- "earn_eth_rewards":"Earn ETH rewards",
- "earn_eth_rewards_description":"Start earning as soon as you stake. Rewards compound automatically.",
- "flexible_unstaking":"Flexible unstaking",
- "flexible_unstaking_description":"Unstake anytime. Typically takes up to 11 days to process.",
- "disclaimer":"Staking does not guarantee rewards, and involves risks including a loss of funds.",
- "learn_more":"Learn more",
- "got_it":"Got it",
- "your_balance": "Your balance",
- "stake_your_eth_cta": {
- "base": "Stake your ETH with MetaMask Pool and earn",
- "annually": "annually.",
- "learn_more_with_period": "Learn more."
- },
- "day": {
- "zero": "",
- "one": "day",
- "other": "days"
- },
- "hour": {
- "zero": "",
- "one": "hour",
- "other": "hours"
- },
- "minute": {
- "zero": "",
- "one": "minute",
- "other": "minutes"
- },
- "banner_text": {
- "has_claimable_eth": "You can claim {{amountEth}} ETH. Once claimed, you'll get ETH back in your wallet.",
- "unstaking_in_progress": {
- "base": "Unstaking {{amountEth}} ETH in progress. Come back in",
- "and": "and",
- "to_claim_it": "to claim it.",
- "default": "Unstaking {{amountEth}} ETH in progress. Come back later to claim it."
- },
- "geo_blocked": "You’re located in a region where unstaking or staking isn’t permitted.",
- "approximately": "approximately"
- }
+ "balance":"Balance"
},
"default_settings": {
"title": "Your Wallet is ready",
@@ -3392,12 +3355,5 @@
"title": "Reward rate",
"tooltip": "Expected yearly increase in the value of your stake, based on the reward rate over the past week."
}
- },
- "confirm": {
- "reject": "Reject",
- "confirm": "Confirm",
- "title": {
- "signature": "Signature request"
- }
}
}
diff --git a/package.json b/package.json
index b9e7cc733dc..7f55139a3bb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "metamask",
- "version": "7.31.0",
+ "version": "7.32.0",
"private": true,
"scripts": {
"audit:ci": "./scripts/yarn-audit.sh",
@@ -8,7 +8,6 @@
"watch:clean": "./scripts/build.sh watcher clean",
"clean:ios": "rm -rf ios/build",
"pod:install": "command -v pod && bundle exec pod install --project-directory=ios || echo \"pod command not found. Skipping pod install\"",
- "gem:bundle:install": "bundle install --gemfile=ios/Gemfile",
"clean:ppom": "rm -rf ppom/dist ppom/node_modules app/lib/ppom/ppom.html.js",
"clean:android": "rm -rf android/app/build",
"clean:node": "rm -rf node_modules && yarn --frozen-lockfile",
@@ -19,7 +18,9 @@
"lint:tsc": "tsc --project ./tsconfig.json",
"format": "prettier '**/*.{js,ts,tsx,json,feature}' --write",
"setup": "yarn clean && node scripts/setup.mjs",
+ "setup:node": "yarn allow-scripts && yarn patch-package",
"setup:e2e": "cd wdio && yarn install",
+ "setup:detox-e2e": "./scripts/detox-setup.sh",
"start:ios": "./scripts/build.sh ios debug",
"start:ios:qa": "./scripts/build.sh ios qaDebug",
"start:ios:e2e": "./scripts/build.sh ios debugE2E",
@@ -81,6 +82,12 @@
"prestorybook": "rnstl",
"deduplicate": "yarn yarn-deduplicate && yarn install",
"set-version": "./scripts/set-versions.sh",
+ "add-release-label-to-pr-and-linked-issues": "ts-node ./.github/scripts/add-release-label-to-pr-and-linked-issues.ts",
+ "run-bitrise-e2e-check": "ts-node ./.github/scripts/bitrise/run-bitrise-e2e-check.ts",
+ "fitness-functions": "ts-node ./.github/scripts/fitness-functions/index.ts",
+ "check-pr-has-required-labels": "ts-node ./.github/scripts/check-pr-has-required-labels.ts",
+ "close-release-bug-report-issue": "ts-node ./.github/scripts/close-release-bug-report-issue.ts",
+ "check-template-and-add-labels": "ts-node ./.github/scripts/check-template-and-add-labels.ts",
"patch:tx": "./scripts/patch-transaction-controller.sh",
"patch:assets": "./scripts/patch-assets-controllers.sh",
"patch:approval": "./scripts/patch-approval-controller.sh",
@@ -142,34 +149,33 @@
"@keystonehq/metamask-airgapped-keyring": "^0.13.1",
"@keystonehq/ur-decoder": "^0.12.2",
"@ledgerhq/react-native-hw-transport-ble": "^6.33.2",
- "@metamask/accounts-controller": "^18.2.1",
- "@metamask/address-book-controller": "^6.0.1",
+ "@metamask/accounts-controller": "^18.1.0",
+ "@metamask/address-book-controller": "^4.0.1",
"@metamask/approval-controller": "^7.0.1",
"@metamask/assets-controllers": "^30.0.0",
"@metamask/base-controller": "^7.0.1",
"@metamask/composable-controller": "^3.0.0",
"@metamask/contract-metadata": "^2.1.0",
- "@metamask/controller-utils": "^11.3.0",
+ "@metamask/controller-utils": "^10.0.0",
"@metamask/design-tokens": "^4.0.0",
"@metamask/eth-ledger-bridge-keyring": "^4.1.0",
"@metamask/eth-query": "^4.0.0",
"@metamask/eth-sig-util": "^7.0.2",
- "@metamask/eth-snap-keyring": "^4.3.3",
"@metamask/etherscan-link": "^2.0.0",
"@metamask/gas-fee-controller": "^18.0.0",
"@metamask/key-tree": "^9.0.0",
"@metamask/keyring-api": "^8.1.0",
- "@metamask/keyring-controller": "^17.2.1",
- "@metamask/logging-controller": "^6.0.1",
+ "@metamask/keyring-controller": "^16.1.0",
+ "@metamask/logging-controller": "^3.0.0",
"@metamask/message-signing-snap": "^0.3.3",
"@metamask/network-controller": "^20.1.0",
- "@metamask/notification-services-controller": "^0.8.0",
+ "@metamask/notification-services-controller": "^0.2.1",
"@metamask/permission-controller": "^11.0.0",
"@metamask/phishing-controller": "^12.0.3",
"@metamask/post-message-stream": "^8.0.0",
"@metamask/ppom-validator": "0.32.0",
"@metamask/preferences-controller": "^11.0.0",
- "@metamask/profile-sync-controller": "^0.8.1",
+ "@metamask/profile-sync-controller": "^0.2.1",
"@metamask/react-native-actionsheet": "2.4.2",
"@metamask/react-native-button": "^3.0.0",
"@metamask/react-native-payments": "^2.0.0",
@@ -179,20 +185,20 @@
"@metamask/scure-bip39": "^2.1.0",
"@metamask/sdk-communication-layer": "0.29.0-wallet",
"@metamask/selected-network-controller": "^15.0.2",
- "@metamask/signature-controller": "^19.1.0",
+ "@metamask/signature-controller": "^17.0.0",
"@metamask/slip44": "3.1.0",
- "@metamask/smart-transactions-controller": "^13.0.0",
- "@metamask/snaps-controllers": "^9.8.0",
- "@metamask/snaps-execution-environments": "^6.7.2",
+ "@metamask/smart-transactions-controller": "11.0.0",
+ "@metamask/snaps-controllers": "^9.4.0",
+ "@metamask/snaps-execution-environments": "^6.6.2",
"@metamask/snaps-rpc-methods": "^9.1.4",
- "@metamask/snaps-sdk": "^6.5.0",
- "@metamask/snaps-utils": "^8.1.1",
+ "@metamask/snaps-sdk": "^6.2.1",
+ "@metamask/snaps-utils": "^8.0.1",
"@metamask/swappable-obj-proxy": "^2.1.0",
"@metamask/swaps-controller": "^9.0.12",
"@metamask/transaction-controller": "^35.0.0",
- "@metamask/utils": "^9.2.1",
+ "@metamask/utils": "^9.1.0",
"@ngraveio/bc-ur": "^1.1.6",
- "@notifee/react-native": "^9.0.0",
+ "@notifee/react-native": "^7.8.2",
"@react-native-async-storage/async-storage": "^1.23.1",
"@react-native-clipboard/clipboard": "1.8.4",
"@react-native-community/blur": "^4.4.0",
@@ -201,8 +207,8 @@
"@react-native-community/netinfo": "^9.5.0",
"@react-native-community/slider": "^4.4.3",
"@react-native-cookies/cookies": "^6.2.1",
- "@react-native-firebase/app": "^20.5.0",
- "@react-native-firebase/messaging": "^20.5.0",
+ "@react-native-firebase/app": "^20.1.0",
+ "@react-native-firebase/messaging": "^20.1.0",
"@react-native-masked-view/masked-view": "^0.3.1",
"@react-native-picker/picker": "^2.2.1",
"@react-native/eslint-config": "^0.75.2",
@@ -296,7 +302,6 @@
"react-native-elevated-view": "0.0.6",
"react-native-emoji": "1.3.1",
"react-native-fade-in-image": "1.4.1",
- "react-native-fast-crypto": "^2.2.0",
"react-native-flash-message": "0.1.11",
"react-native-fs": "^2.20.0",
"react-native-gesture-handler": "^1.10.3",
@@ -362,6 +367,8 @@
"zxcvbn": "4.4.2"
},
"devDependencies": {
+ "@actions/core": "^1.10.1",
+ "@actions/github": "^6.0.0",
"@babel/core": "^7.24.5",
"@babel/eslint-parser": "^7.25.1",
"@babel/preset-env": "^7.24.5",
@@ -440,7 +447,7 @@
"browserstack-local": "^1.5.1",
"chromedriver": "^123.0.1",
"depcheck": "^1.4.7",
- "detox": "20.27.2",
+ "detox": "20.23.1",
"dotenv": "^16.0.3",
"enzyme": "3.9.0",
"enzyme-adapter-react-16": "1.10.0",
@@ -487,7 +494,8 @@
"regenerator-runtime": "0.13.9",
"rn-nodeify": "10.3.0",
"serve-handler": "^6.1.5",
- "simple-git": "^3.25.0",
+ "simple-git": "^3.22.0",
+ "ts-node": "^10.5.0",
"typescript": "~5.4.5",
"wdio-cucumberjs-json-reporter": "^4.4.3",
"webpack": "^5.88.2",
@@ -574,15 +582,14 @@
"husky": false,
"react-native-inappbrowser-reborn": false,
"react-native-svg-asset-plugin>sharp": true,
- "@storybook/builder-webpack5>@swc/core": false,
+ "ts-node>@swc/core": false,
"@metamask/sdk-communication-layer>bufferutil": false,
"@metamask/sdk-communication-layer>utf-8-validate": false,
"detox>ws>bufferutil": false,
"@metamask/notification-services-controller>firebase>@firebase/firestore>@grpc/proto-loader>protobufjs": false,
"@metamask/sdk-communication-layer>eciesjs>secp256k1": false,
"detox>ws>utf-8-validate": false,
- "ganache>@trufflesuite/uws-js-unofficial>utf-8-validate": false,
- "@react-native-firebase/app>firebase>@firebase/firestore>@grpc/proto-loader>protobufjs": false
+ "ganache>@trufflesuite/uws-js-unofficial>utf-8-validate": false
}
},
"packageManager": "yarn@1.22.22"
diff --git a/patches/@metamask+smart-transactions-controller+11.0.0.patch b/patches/@metamask+smart-transactions-controller+11.0.0.patch
new file mode 100644
index 00000000000..3df5c0587ee
--- /dev/null
+++ b/patches/@metamask+smart-transactions-controller+11.0.0.patch
@@ -0,0 +1,15 @@
+diff --git a/node_modules/@metamask/smart-transactions-controller/dist/SmartTransactionsController.js b/node_modules/@metamask/smart-transactions-controller/dist/SmartTransactionsController.js
+index cd9bd16..79fb857 100644
+--- a/node_modules/@metamask/smart-transactions-controller/dist/SmartTransactionsController.js
++++ b/node_modules/@metamask/smart-transactions-controller/dist/SmartTransactionsController.js
+@@ -77,8 +77,8 @@ class SmartTransactionsController extends polling_controller_1.StaticIntervalPol
+ this.getMetaMetricsProps = getMetaMetricsProps;
+ this.initializeSmartTransactionsForChainId();
+ __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_ensureUniqueSmartTransactions).call(this);
+- onNetworkStateChange(({ providerConfig: newProvider }) => {
+- const { chainId } = newProvider;
++ onNetworkStateChange((state) => {
++ const { chainId } = this.getNetworkClientById(state.selectedNetworkClientId);
+ const isNewChainId = chainId !== this.config.chainId;
+ this.configure({ chainId });
+ this.initializeSmartTransactionsForChainId();
diff --git a/scripts/detox-setup.sh b/scripts/detox-setup.sh
new file mode 100755
index 00000000000..9c8a61f8094
--- /dev/null
+++ b/scripts/detox-setup.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Install detox-cli
+echo "Installing detox-cli..."
+yarn global add detox-cli
+
+# Install applesimutils
+echo "Installing applesimutils..."
+brew tap wix/brew
+brew install applesimutils
+
+echo "Installation complete."
\ No newline at end of file
diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index 3ef506222ca..bf75d52672d 100644
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -31,7 +31,7 @@ RUN bash -c "[ ${GID} != \"1000\" ] && groupadd -g ${GID} -U node userz || true
&& echo '%sudo ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
# install ruby deps
-COPY --chown=${UID}:${GID} ios/Gemfile* .ruby-version /tmp/app/
+COPY --chown=${UID}:${GID} Gemfile* .ruby-version /tmp/app/
WORKDIR /tmp/app
####
@@ -58,10 +58,7 @@ RUN bash -c 'eval "$(/home/node/.rbenv/bin/rbenv init -)" \
&& bundle install'
# fix broken ipv6 on nodejs v20
-ENV NODE_OPTIONS="--no-network-family-autoselection --trace-warnings"
-# minimize ruby memory usage
-ENV MALLOC_ARENA_MAX=1
-ENV PATH=/home/node/.rbenv/shims/:$PATH
-ENV LANG=en_US.UTF-8
+env NODE_OPTIONS="--no-network-family-autoselection --trace-warnings"
+env PATH=/home/node/.rbenv/shims/:$PATH
WORKDIR /app
diff --git a/scripts/setup.mjs b/scripts/setup.mjs
index 1831d495670..10f2bd6ae22 100644
--- a/scripts/setup.mjs
+++ b/scripts/setup.mjs
@@ -4,27 +4,12 @@ import { $ } from 'execa';
import { Listr } from 'listr2';
import path from 'path';
-const IS_CI = process.env.CI;
const IS_OSX = process.platform === 'darwin';
-// iOS builds are enabled by default on macOS only but can be enabled or disabled explicitly
-let BUILD_IOS = IS_OSX;
-let IS_NODE = false;
-const args = process.argv.slice(2) || [];
-for (const arg of args) {
- switch (arg) {
- case '--build-ios':
- BUILD_IOS = true;
- continue;
- case '--no-build-ios':
- BUILD_IOS = false;
- continue;
- case '--node':
- IS_NODE = true;
- continue;
- default:
- throw new Error(`Unrecognized CLI arg ${arg}`);
- }
-}
+const input = process.argv.slice(2)?.[0];
+// iOS builds are enabled by default on macOS only but can be enabled explicitly
+const BUILD_IOS = input === '--build-ios' || IS_OSX;
+const IS_NODE = input === '--node';
+const IS_CI = process.env.CI;
const rendererOptions = {
collapseErrors: false,
@@ -36,68 +21,32 @@ const rendererOptions = {
/*
* TODO: parse example env file and add missing variables to existing .js.env
*/
-const copyAndSourceEnvVarsTask = {
- title: 'Copy and source environment variables',
- task: (_, task) => {
+const copyEnvVarsTask = {
+ title: 'Copy env vars',
+ task: async (_, task) => {
if (IS_CI) {
- return task.skip('Skipping copying and sourcing environment variables.');
+ task.skip('CI detected');
+ } else {
+ const envFiles = ['.js.env', '.ios.env', '.android.env', '.e2e.env'];
+ envFiles.forEach((envFileName) => {
+ try {
+ fs.copyFileSync(
+ `${envFileName}.example`,
+ envFileName,
+ fs.constants.COPYFILE_EXCL,
+ );
+ } catch (err) {
+ // Ignore if file already exists
+ return;
+ }
+ });
}
-
- return task.newListr(
- [
- {
- title: 'Copy env vars',
- task: async () => {
- const envFiles = [
- '.js.env',
- '.ios.env',
- '.android.env',
- '.e2e.env',
- ];
- envFiles.forEach((envFileName) => {
- try {
- fs.copyFileSync(
- `${envFileName}.example`,
- envFileName,
- fs.constants.COPYFILE_EXCL,
- );
- } catch (err) {
- // Ignore if file already exists
- return;
- }
- });
- },
- },
- {
- title: 'Source env vars',
- task: async () => {
- const envFiles = [
- '.js.env',
- '.ios.env',
- '.android.env',
- '.e2e.env',
- ];
- envFiles.forEach((envFileName) => {
- `source ${envFileName}`;
- });
- },
- },
- ],
- {
- concurrent: false,
- exitOnError: true,
- rendererOptions,
- },
- );
},
};
-const buildPpomTask = {
+const ppomBuildTask = {
title: 'Build PPOM',
task: (_, task) => {
- if (IS_NODE) {
- return task.skip('Skipping building PPOM.');
- }
const $ppom = $({ cwd: 'ppom' });
return task.newListr(
@@ -130,31 +79,92 @@ const buildPpomTask = {
{
concurrent: false,
exitOnError: true,
- rendererOptions,
},
);
},
};
-const setupIosTask = {
- title: 'Set up iOS',
- task: async (_, task) => {
- if (!BUILD_IOS) {
- return task.skip('Skipping iOS set up.');
- }
+const gemInstallTask = {
+ title: 'Install gems',
+ task: (_, task) =>
+ task.newListr(
+ [
+ {
+ title: 'Install gems using bundler',
+ task: async (_, gemInstallTask) => {
+ if (!BUILD_IOS) {
+ return gemInstallTask.skip('Skipping iOS.');
+ }
+ await $`bundle install`;
+ },
+ },
+ ],
+ {
+ exitOnError: true,
+ concurrent: false,
+ rendererOptions,
+ },
+ ),
+};
- return task.newListr(
+const mainSetupTask = {
+ title: 'Dependencies setup',
+ task: (_, task) =>
+ task.newListr(
+ [
+ {
+ title: 'Install CocoaPods',
+ task: async (_, podInstallTask) => {
+ if (!BUILD_IOS) {
+ return podInstallTask.skip('Skipping iOS.');
+ }
+ await $`bundle exec pod install --project-directory=ios`;
+ },
+ },
+ {
+ title: 'Run lavamoat allow-scripts',
+ task: async () => {
+ await $`yarn allow-scripts`;
+ },
+ },
+ copyEnvVarsTask,
+ ],
+ {
+ exitOnError: false,
+ concurrent: true,
+ rendererOptions,
+ },
+ ),
+};
+
+const patchModulesTask = {
+ title: 'Patch modules',
+ task: (_, task) =>
+ task.newListr(
[
{
- title: 'Install bundler gem',
+ title: 'Build Inpage Bridge',
+ task: async () => {
+ await $`./scripts/build-inpage-bridge.sh`;
+ },
+ },
+ // TODO: find a saner alternative to bring node modules into react native bundler. See ReactNativify
+ {
+ title: 'React Native nodeify',
task: async () => {
- await $`gem install bundler -v 2.5.8`;
+ await $`node_modules/.bin/rn-nodeify --install crypto,buffer,react-native-randombytes,vm,stream,http,https,os,url,net,fs --hack`;
},
},
{
- title: 'Install gems',
+ title: 'Jetify',
task: async () => {
- await $`yarn gem:bundle:install`;
+ await $`yarn jetify`;
+ },
+ },
+ {
+ title: 'Patch npm packages',
+ task: async () => {
+ await $`yarn patch-package`;
},
},
{
@@ -165,9 +175,9 @@ const setupIosTask = {
},
},
{
- title: 'Install CocoaPods',
+ title: 'Init git submodules',
task: async () => {
- await $`yarn pod:install`;
+ await $`git submodule update --init`;
},
},
],
@@ -175,62 +185,20 @@ const setupIosTask = {
concurrent: false,
exitOnError: true,
},
- );
- },
-};
-
-const buildInpageBridgeTask = {
- title: 'Build inpage bridge',
- task: async (_, task) => {
- if (IS_NODE) {
- return task.skip('Skipping building inpage bridge.');
- }
- await $`./scripts/build-inpage-bridge.sh`;
- },
-};
-
-const nodeifyTask = {
- // TODO: find a saner alternative to bring node modules into react native bundler. See ReactNativify
- title: 'Nodeify npm packages',
- task: async (_, task) => {
- if (IS_NODE) {
- return task.skip('Skipping nodeifying npm packages.');
- }
- await $`node_modules/.bin/rn-nodeify --install crypto,buffer,react-native-randombytes,vm,stream,http,https,os,url,net,fs --hack`;
- },
-};
-
-const jetifyTask = {
- title: 'Jetify npm packages for Android',
- task: async (_, task) => {
- if (IS_NODE) {
- return task.skip('Skipping jetifying npm packages.');
- }
- await $`yarn jetify`;
- },
-};
-
-const patchPackageTask = {
- title: 'Patch npm packages',
- task: async () => {
- await $`yarn patch-package`;
- },
+ ),
};
-const updateGitSubmodulesTask = {
- title: 'Init git submodules',
+const sourceEnvs = {
+ title: 'Source env vars',
task: async (_, task) => {
- if (IS_NODE) {
- return task.skip('Skipping init git submodules.');
+ if (IS_CI) {
+ task.skip('CI detected');
+ } else {
+ const envFiles = ['.js.env', '.ios.env', '.android.env', '.e2e.env'];
+ envFiles.forEach((envFileName) => {
+ `source ${envFileName}`;
+ });
}
- await $`git submodule update --init`;
- },
-};
-
-const runLavamoatAllowScriptsTask = {
- title: 'Run lavamoat allow-scripts',
- task: async () => {
- await $`yarn allow-scripts`;
},
};
@@ -281,53 +249,32 @@ const generateTermsOfUseTask = {
{
concurrent: false,
exitOnError: true,
- rendererOptions,
},
),
};
-/**
- * Tasks that changes node modules and should run sequentially
- */
-const prepareDependenciesTask = {
- title: 'Prepare dependencies',
- task: (_, task) =>
- task.newListr(
- [
- copyAndSourceEnvVarsTask,
- updateGitSubmodulesTask,
- // Inpage bridge must generate before node modules are altered
- buildInpageBridgeTask,
- nodeifyTask,
- jetifyTask,
- runLavamoatAllowScriptsTask,
- patchPackageTask,
- ],
- {
- exitOnError: true,
- concurrent: false,
- rendererOptions,
- },
- ),
+// Optimize for CI performance
+const yarnSetupNodeTask = {
+ title: 'Run yarn setup:node',
+ task: async () => {
+ await $`yarn setup:node`;
+ },
};
-/**
- * Tasks that are run concurrently
- */
-const concurrentTasks = {
- title: 'Concurrent tasks',
- task: (_, task) =>
- task.newListr([setupIosTask, buildPpomTask, generateTermsOfUseTask], {
- concurrent: true,
- exitOnError: true,
- rendererOptions,
- }),
-};
+const taskList = IS_NODE
+ ? [yarnSetupNodeTask, generateTermsOfUseTask]
+ : [
+ gemInstallTask,
+ patchModulesTask,
+ mainSetupTask,
+ ppomBuildTask,
+ sourceEnvs,
+ generateTermsOfUseTask,
+ ];
-const tasks = new Listr([prepareDependenciesTask, concurrentTasks], {
- concurrent: false,
+const tasks = new Listr(taskList, {
exitOnError: true,
- rendererOptions,
+ concurrent: false,
});
await tasks.run();
diff --git a/sonar-project.properties b/sonar-project.properties
index cb542a3ba9c..65c2040922e 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -15,7 +15,7 @@ sonar.exclusions=**.stories.**, e2e/**, wdio/**
sonar.test.inclusions=**.test.**
# Excluded project files from coverage.
-sonar.coverage.exclusions=**AccountConnectMultiSelector**, **AccountPermissionsConfirmRevokeAll**, **PermissionsSettings**, **NetworkConnectMultiSelector**, **NetworkSelectorList**, **PermissionsSummary**, **AccountConnect.tsx, **util/test**
+sonar.coverage.exclusions=**AccountConnectMultiSelector**, **AccountPermissionsConfirmRevokeAll**, **PermissionsSettings**, **NetworkConnectMultiSelector**, **NetworkSelectorList**
# Test coverage path in GitHub action
sonar.javascript.lcov.reportPaths=/coverage/lcov.info
diff --git a/storybook/decorators/withNavigation.tsx b/storybook/decorators/withNavigation.tsx
index 7c24ddd9c7b..90539306928 100644
--- a/storybook/decorators/withNavigation.tsx
+++ b/storybook/decorators/withNavigation.tsx
@@ -1,60 +1,21 @@
import React from 'react';
import { createStackNavigator } from '@react-navigation/stack';
import { NavigationContainer } from '@react-navigation/native';
-import TooltipModal from '../../app/components/Views/TooltipModal';
-import Routes from '../../app/constants/navigation/Routes';
-import { colors as importedColors } from '../../app/styles/common';
const StoryBookStack = createStackNavigator();
-const clearStackNavigatorOptions = {
- headerShown: false,
- cardStyle: {
- backgroundColor: 'transparent',
- cardStyleInterpolator: () => ({
- overlayStyle: {
- opacity: 0,
- },
- }),
- },
- animationEnabled: false,
-};
-
-const StorybookRootModalFlow = () => (
-
-
-
-);
-
// TODO: Replace "any" with type
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const withNavigation = (story: any) => {
const StorybookScreen = () => story();
return (
-
+
-
);
diff --git a/storybook/storyLoader.js b/storybook/storyLoader.js
index a786e95a965..3627794ee90 100644
--- a/storybook/storyLoader.js
+++ b/storybook/storyLoader.js
@@ -12,7 +12,6 @@ function loadStories() {
require('../app/component-library/components/Avatars/Avatar/variants/AvatarIcon/AvatarIcon.stories');
require('../app/component-library/components/Avatars/Avatar/variants/AvatarNetwork/AvatarNetwork.stories');
require('../app/component-library/components/Avatars/Avatar/variants/AvatarToken/AvatarToken.stories');
- require('../app/component-library/components/Avatars/AvatarGroup/AvatarGroup.stories');
require('../app/component-library/components/Badges/Badge/Badge.stories');
require('../app/component-library/components/Badges/Badge/variants/BadgeNetwork/BadgeNetwork.stories');
require('../app/component-library/components/Badges/Badge/variants/BadgeNotifications/BadgeNotifications.stories');
@@ -34,6 +33,7 @@ function loadStories() {
require('../app/component-library/components/Cells/Cell/variants/CellDisplay/CellDisplay.stories');
require('../app/component-library/components/Cells/Cell/variants/CellMultiSelect/CellMultiSelect.stories');
require('../app/component-library/components/Cells/Cell/variants/CellSelect/CellSelect.stories');
+ require('../app/component-library/components/Cells/Cell/variants/CellSelectWithMenu/CellSelectWithMenu.stories');
require('../app/component-library/components/Checkbox/Checkbox.stories');
require('../app/component-library/components/Form/HelpText/HelpText.stories');
require('../app/component-library/components/Form/Label/Label.stories');
@@ -72,19 +72,16 @@ function loadStories() {
require('../app/components/UI/Name/Name.stories');
require('../app/components/UI/SimulationDetails/SimulationDetails.stories');
require('../app/components/UI/StyledButton/StyledButton.stories');
+ require('../app/components/UI/TextEstimated/TextEstimated.stories');
require('../app/components/UI/WarningAlert/WarningAlert.stories');
- require('../app/components/Views/AssetDetails/AssetDetailsActions/AssetDetailsActions.stories');
require('../app/components/Views/confirmations/components/BlockaidBanner/BlockaidBanner.stories');
- require('../app/components/Views/QRAccountDisplay/QRAccountDisplay.stories');
require('../app/component-library/components-temp/Accounts/AccountBalance/AccountBalance.stories');
- require('../app/component-library/components-temp/CellSelectWithMenu/CellSelectWithMenu.stories');
require('../app/component-library/components-temp/Contracts/ContractBox/ContractBox.stories');
require('../app/component-library/components-temp/CustomSpendCap/CustomSpendCap.stories');
- require('../app/component-library/components-temp/KeyValueRow/KeyValueRow.stories');
- require('../app/component-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.stories');
+ require('../app/component-library/components-temp/TagColored/TagColored.stories');
require('../app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.stories');
require('../app/component-library/components-temp/Price/PercentageChange/PercentageChange.stories');
- require('../app/component-library/components-temp/TagColored/TagColored.stories');
+ require('../app/components/Views/AssetDetails/AssetDetailsActions/AssetDetailsActions.stories.tsx');
}
const stories = [
@@ -96,7 +93,6 @@ const stories = [
'../app/component-library/components/Avatars/Avatar/variants/AvatarIcon/AvatarIcon.stories',
'../app/component-library/components/Avatars/Avatar/variants/AvatarNetwork/AvatarNetwork.stories',
'../app/component-library/components/Avatars/Avatar/variants/AvatarToken/AvatarToken.stories',
- '../app/component-library/components/Avatars/AvatarGroup/AvatarGroup.stories',
'../app/component-library/components/Badges/Badge/Badge.stories',
'../app/component-library/components/Badges/Badge/variants/BadgeNetwork/BadgeNetwork.stories',
'../app/component-library/components/Badges/Badge/variants/BadgeNotifications/BadgeNotifications.stories',
@@ -118,6 +114,7 @@ const stories = [
'../app/component-library/components/Cells/Cell/variants/CellDisplay/CellDisplay.stories',
'../app/component-library/components/Cells/Cell/variants/CellMultiSelect/CellMultiSelect.stories',
'../app/component-library/components/Cells/Cell/variants/CellSelect/CellSelect.stories',
+ '..app/component-library/components-temp/CellSelectWithMenu/CellSelectWithMenu.stories.tsx',
'../app/component-library/components/Checkbox/Checkbox.stories',
'../app/component-library/components/Form/HelpText/HelpText.stories',
'../app/component-library/components/Form/Label/Label.stories',
@@ -156,19 +153,16 @@ const stories = [
'../app/components/UI/Name/Name.stories',
'../app/components/UI/SimulationDetails/SimulationDetails.stories',
'../app/components/UI/StyledButton/StyledButton.stories',
+ '../app/components/UI/TextEstimated/TextEstimated.stories',
'../app/components/UI/WarningAlert/WarningAlert.stories',
- '../app/components/Views/AssetDetails/AssetDetailsActions/AssetDetailsActions.stories',
'../app/components/Views/confirmations/components/BlockaidBanner/BlockaidBanner.stories',
- '../app/components/Views/QRAccountDisplay/QRAccountDisplay.stories',
'../app/component-library/components-temp/Accounts/AccountBalance/AccountBalance.stories',
- '../app/component-library/components-temp/CellSelectWithMenu/CellSelectWithMenu.stories',
'../app/component-library/components-temp/Contracts/ContractBox/ContractBox.stories',
'../app/component-library/components-temp/CustomSpendCap/CustomSpendCap.stories',
- '../app/component-library/components-temp/KeyValueRow/KeyValueRow.stories',
- '../app/component-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.stories',
- '../app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.stories',
- '../app/component-library/components-temp/Price/PercentageChange/PercentageChange.stories',
'../app/component-library/components-temp/TagColored/TagColored.stories',
+ '../app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.stories.tsx',
+ '../app/component-library/components-temp/Price/PercentageChange/PercentageChange.stories.tsx',
+ '../app/components/Views/AssetDetails/AssetDetailsActions/AssetDetailsActions.stories.tsx',
];
module.exports = {
diff --git a/wdio/features/Performance/ColdStartToOnboardingScreen.feature b/wdio/features/Performance/ColdStartToOnboardingScreen.feature
index 7b879facfba..5cdbf478ad7 100644
--- a/wdio/features/Performance/ColdStartToOnboardingScreen.feature
+++ b/wdio/features/Performance/ColdStartToOnboardingScreen.feature
@@ -7,4 +7,4 @@ Feature: Measure Fresh Install Cold Start
Scenario: Wallet Time To Interact Cold Start on Fresh Install
Given the app is launched
When the Welcome screen is displayed
- Then the app start time should not exceed "500" milliseconds
\ No newline at end of file
+ Then the app should launch within "1" seconds
\ No newline at end of file
diff --git a/wdio/screen-objects/AddCustomImportTokensScreen.js b/wdio/screen-objects/AddCustomImportTokensScreen.js
index bf327fd8387..69a63fc40eb 100644
--- a/wdio/screen-objects/AddCustomImportTokensScreen.js
+++ b/wdio/screen-objects/AddCustomImportTokensScreen.js
@@ -1,27 +1,33 @@
+/* eslint-disable no-undef */
import Gestures from '../helpers/Gestures';
import Selectors from '../helpers/Selectors';
import {
- ImportTokenViewSelectorsIDs,
- ImportTokenViewSelectorsText
-} from '../../e2e/selectors/wallet/ImportTokenView.selectors';
+ TOKEN_ADDRESS_INPUT_BOX_ID,
+ TOKEN_ADDRESS_SYMBOL_ID,
+ TOKEN_IMPORT_BUTTON_ID,
+} from './testIDs/Screens/AddCustomToken.testIds';
class AddCustomImportToken {
get customTokenAddressField() {
- return Selectors.getElementByPlatform(ImportTokenViewSelectorsIDs.ADDRESS_INPUT);
+ return Selectors.getElementByPlatform(TOKEN_ADDRESS_INPUT_BOX_ID);
}
get importButton() {
- return Selectors.getXpathElementByText(ImportTokenViewSelectorsText.IMPORT_BUTTON);
+ return Selectors.getElementByPlatform(TOKEN_IMPORT_BUTTON_ID);
}
get symbolField() {
- return Selectors.getElementByPlatform(ImportTokenViewSelectorsIDs.SYMBOL_INPUT);
+ return Selectors.getElementByPlatform(TOKEN_ADDRESS_SYMBOL_ID);
}
async typeCustomTokenAddress(text) {
await Gestures.typeText(this.customTokenAddressField, text);
}
+ async scrollToImportButton() {
+ await Gestures.swipe({ x: 300, y: 1000 }, { x: 300, y: 10 });
+ }
+
async tapImportButton() {
await Gestures.waitAndTap(this.importButton);
}
@@ -30,6 +36,10 @@ class AddCustomImportToken {
await Gestures.waitAndTap(this.symbolField);
}
+ async isTokenSymbolDisplayed() {
+ await Gestures.waitAndTap(this.symbolField);
+ }
+
async waitForImportButtonEnabled() {
const importButton = await this.importButton;
await importButton.waitForEnabled();
diff --git a/wdio/screen-objects/Onboarding/OnboardingCarousel.js b/wdio/screen-objects/Onboarding/OnboardingCarousel.js
index 1a861991816..ce1952a5244 100644
--- a/wdio/screen-objects/Onboarding/OnboardingCarousel.js
+++ b/wdio/screen-objects/Onboarding/OnboardingCarousel.js
@@ -3,7 +3,6 @@ import {
WELCOME_SCREEN_CAROUSEL_TITLE_ID,
} from '../testIDs/Screens/WelcomeScreen.testIds';
import { SPLASH_SCREEN_METAMASK_ANIMATION_ID } from '../testIDs/Components/MetaMaskAnimation.testIds';
-import { PerformanceRegressionSelectorIDs } from '../../../e2e/selectors/PerformanceRegression.selectors'
import Gestures from '../../helpers/Gestures';
import Selectors from '../../helpers/Selectors';
@@ -30,17 +29,6 @@ class WelcomeScreen {
);
}
- async getLaunchDuration() {
- return await Selectors.getXpathElementByResourceId(
- PerformanceRegressionSelectorIDs.APP_START_TIME_ID,
- );
- }
-
- async isGetLaunchDurationDisplayed() {
- const element = await this.getLaunchDuration();
- await expect(element).toBeDisplayed();
- }
-
async waitForSplashAnimationToDisplay() {
const elem = await this.splashScreenMetamaskAnimationId;
const getStartedElem = await this.getStartedButton;
diff --git a/wdio/screen-objects/TokenOverviewScreen.js b/wdio/screen-objects/TokenOverviewScreen.js
index 2fc17edb3b3..5eee33b3267 100644
--- a/wdio/screen-objects/TokenOverviewScreen.js
+++ b/wdio/screen-objects/TokenOverviewScreen.js
@@ -1,10 +1,10 @@
import {
+ ASSET_BACK_BUTTON,
TOKEN_ASSET_OVERVIEW,
TOKEN_OVERVIEW_SEND_BUTTON,
} from './testIDs/Screens/TokenOverviewScreen.testIds.js';
import Selectors from '../helpers/Selectors';
import Gestures from '../helpers/Gestures';
-import { ImportTokenViewSelectorsIDs } from '../../e2e/selectors/wallet/ImportTokenView.selectors';
class TokenOverviewScreen {
get tokenAssetOverview() {
@@ -16,7 +16,7 @@ class TokenOverviewScreen {
}
get backButtonTokenOverview() {
- return Selectors.getElementByPlatform(ImportTokenViewSelectorsIDs.BACK_BUTTON);
+ return Selectors.getElementByPlatform(ASSET_BACK_BUTTON);
}
async tapBackButton() {
diff --git a/wdio/screen-objects/testIDs/Screens/AddCustomToken.testIds.js b/wdio/screen-objects/testIDs/Screens/AddCustomToken.testIds.js
new file mode 100644
index 00000000000..37282d2ab20
--- /dev/null
+++ b/wdio/screen-objects/testIDs/Screens/AddCustomToken.testIds.js
@@ -0,0 +1,11 @@
+export const CUSTOM_TOKEN_CONTAINER_ID = 'add-custom-token-screen';
+export const TOKEN_CONTAINER_ID = 'add-custom-token-screen';
+export const TOKEN_ADDRESS_INPUT_BOX_ID = 'input-token-address';
+export const TOKEN_ADDRESS_SYMBOL_ID = 'input-token-symbol';
+export const TOKEN_ADDRESS_WARNING_MESSAGE_ID = 'token-address-warning';
+export const TOKEN_PRECISION_WARNING_MESSAGE_ID = 'token-decimals-warning';
+export const CUSTOM_TOKEN_BACK_BUTTON_ID = 'asset-back-button';
+export const TOKEN_IMPORT_BUTTON_ID = 'add-custom-asset-confirm-button';
+export const TOKEN_CANCEL_IMPORT_BUTTON_ID = 'add-asset-cancel-button';
+export const ADD_CONFIRM_CUSTOM_ASSET = 'add-confirm-custom-asset';
+export const ADD_CANCEL_ADD_CUSTOM_ASSET_MODAL = 'add-cancel-custom-asset-modal';
diff --git a/wdio/screen-objects/testIDs/Screens/AssetSearch.testIds.js b/wdio/screen-objects/testIDs/Screens/AssetSearch.testIds.js
new file mode 100644
index 00000000000..cc40a4da924
--- /dev/null
+++ b/wdio/screen-objects/testIDs/Screens/AssetSearch.testIds.js
@@ -0,0 +1,3 @@
+export const TOKEN_INPUT_BOX_ID = 'input-search-asset';
+export const ASSET_BACK_BUTTON = 'asset-back-button';
+export const TOKEN_IMPORT_NEXT_BUTTON = 'token-import-next-button'
diff --git a/wdio/screen-objects/testIDs/Screens/EnableDeviceNotificationsChecksAlert.testIds.js b/wdio/screen-objects/testIDs/Screens/EnableDeviceNotificationsChecksAlert.testIds.js
deleted file mode 100644
index c12c78557f5..00000000000
--- a/wdio/screen-objects/testIDs/Screens/EnableDeviceNotificationsChecksAlert.testIds.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export const ENABLE_DEVICE_NOTIFICATION_NO_THANKS_BUTTON_ID =
- "Don't Allow";
-export const ENABLE_DEVICE_NOTIFICATIONS_CONTAINER_ID =
- 'Would Like to Send You Notifications';
-export const ENABLE_DEVICE_NOTIFICATIONS_YES_BUTTON_ID = 'Allow';
-
diff --git a/wdio/screen-objects/testIDs/Screens/NFTImportScreen.testIds.js b/wdio/screen-objects/testIDs/Screens/NFTImportScreen.testIds.js
new file mode 100644
index 00000000000..19772a0b2d8
--- /dev/null
+++ b/wdio/screen-objects/testIDs/Screens/NFTImportScreen.testIds.js
@@ -0,0 +1,7 @@
+export const NFT_ADDRESS_INPUT_BOX_ID = 'input-collectible-address';
+export const NFT_ADDRESS_WARNING_MESSAGE_ID = 'collectible-address-warning';
+export const NFT_IDENTIFIER_WARNING_MESSAGE_ID =
+ 'collectible-identifier-warning';
+export const NFT_IDENTIFIER_INPUT_BOX_ID = 'input-token-decimals';
+export const NEXT_BUTTON_CUSTOM_IMPORT = 'next-button-custom-import';
+
diff --git a/wdio/screen-objects/testIDs/Screens/TokenOverviewScreen.testIds.js b/wdio/screen-objects/testIDs/Screens/TokenOverviewScreen.testIds.js
index c719ab1d7f1..c78ea7691e7 100644
--- a/wdio/screen-objects/testIDs/Screens/TokenOverviewScreen.testIds.js
+++ b/wdio/screen-objects/testIDs/Screens/TokenOverviewScreen.testIds.js
@@ -1,4 +1,7 @@
export const TOKEN_ASSET_OVERVIEW = 'token-asset-overview';
+
+export const ASSET_BACK_BUTTON = 'asset-back-button';
+
export const TOKEN_PRICE = 'token-price';
export const TOKEN_OVERVIEW_SEND_BUTTON = 'token-send-button';
export const TOKEN_OVERVIEW_BRIDGE_BUTTON = 'token-bridge-button';
diff --git a/wdio/step-definitions/app-launch-times.steps.js b/wdio/step-definitions/app-launch-times.steps.js
index 8c2c86f96e1..1f6a8ded1c4 100644
--- a/wdio/step-definitions/app-launch-times.steps.js
+++ b/wdio/step-definitions/app-launch-times.steps.js
@@ -1,6 +1,5 @@
import cucumberJson from 'wdio-cucumberjs-json-reporter';
import { Given, When, Then } from '@wdio/cucumber-framework';
-import WelcomeScreen from '../screen-objects/Onboarding/OnboardingCarousel';
import LoginScreen from '../screen-objects/LoginScreen';
import WalletMainScreen from '../screen-objects/WalletMainScreen.js';
@@ -9,20 +8,16 @@ let stopTimer;
let loginViewTime;
let walletViewToAppearTime;
let total;
-Then(/^the app start time should not exceed "([^"]*)?" milliseconds$/, async (time) => {
- await WelcomeScreen.isGetLaunchDurationDisplayed();
-
- const launchDurationElement = await WelcomeScreen.getLaunchDuration();
- const launchDurationString = await launchDurationElement.getText();
-
- const launchDuration = Number(launchDurationString);
- console.log(`MetaMask App Start Time is: ${launchDuration}`);
- cucumberJson.attach(`App Start Time - Milliseconds: ${launchDuration}`);
+Then(/^the app should launch within "([^"]*)?" seconds$/, async (time) => {
+ stopTimer = new Date().getTime();
+ const launchTime = stopTimer - startTimer;
+ console.log(`The Launch time is: ${launchTime}`);
- await expect(launchDuration).toBeLessThan(Number(time));
+ await expect(launchTime).toBeLessThan(time * 1000);
+ cucumberJson.attach(`Milliseconds: ${launchTime}`);
+ await driver.pause(100);
});
-
Then(/^The Login screen should be visible in "([^"]*)?" seconds$/, async (time) => {
await LoginScreen.isLoginScreenVisible();
diff --git a/yarn.lock b/yarn.lock
index 1dd4b2ea211..cf80f715bce 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,32 @@
# yarn lockfile v1
+"@actions/core@^1.10.1":
+ version "1.10.1"
+ resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.10.1.tgz#61108e7ac40acae95ee36da074fa5850ca4ced8a"
+ integrity sha512-3lBR9EDAY+iYIpTnTIXmWcNbX3T2kCkAEQGIQx4NVQ0575nk2k3GRZDTPQG+vVtS2izSLmINlxXf0uLtnrTP+g==
+ dependencies:
+ "@actions/http-client" "^2.0.1"
+ uuid "^8.3.2"
+
+"@actions/github@^6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@actions/github/-/github-6.0.0.tgz#65883433f9d81521b782a64cc1fd45eef2191ea7"
+ integrity sha512-alScpSVnYmjNEXboZjarjukQEzgCRmjMv6Xj47fsdnqGS73bjJNDpiiXmp8jr0UZLdUB6d9jW63IcmddUP+l0g==
+ dependencies:
+ "@actions/http-client" "^2.2.0"
+ "@octokit/core" "^5.0.1"
+ "@octokit/plugin-paginate-rest" "^9.0.0"
+ "@octokit/plugin-rest-endpoint-methods" "^10.0.0"
+
+"@actions/http-client@^2.0.1", "@actions/http-client@^2.2.0":
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-2.2.1.tgz#ed3fe7a5a6d317ac1d39886b0bb999ded229bb38"
+ integrity sha512-KhC/cZsq7f8I4LfZSJKgCvEwfkE8o1538VoBeoGzokVLLnbFDEAdFD3UhoMklxo2un9NJVBdANOresx7vTHlHw==
+ dependencies:
+ tunnel "^0.0.6"
+ undici "^5.25.4"
+
"@ampproject/remapping@^2.2.0":
version "2.2.1"
resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
@@ -2273,17 +2299,6 @@
resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.1.1.tgz#b9da6a878a371829a0502c9b6c1c143ef6663f4d"
integrity sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==
-"@firebase/analytics-compat@0.2.10":
- version "0.2.10"
- resolved "https://registry.yarnpkg.com/@firebase/analytics-compat/-/analytics-compat-0.2.10.tgz#c98005075c019eb8255764a5279f0ff86b36b863"
- integrity sha512-ia68RcLQLLMFWrM10JfmFod7eJGwqr4/uyrtzHpTDnxGX/6gNCBTOuxdAbyWIqXI5XmcMQdz9hDijGKOHgDfPw==
- dependencies:
- "@firebase/analytics" "0.10.4"
- "@firebase/analytics-types" "0.8.2"
- "@firebase/component" "0.6.7"
- "@firebase/util" "1.9.6"
- tslib "^2.1.0"
-
"@firebase/analytics-compat@0.2.11":
version "0.2.11"
resolved "https://registry.yarnpkg.com/@firebase/analytics-compat/-/analytics-compat-0.2.11.tgz#82995b29805f306ad862773e2cd907ae8fb7b7e5"
@@ -2300,17 +2315,6 @@
resolved "https://registry.yarnpkg.com/@firebase/analytics-types/-/analytics-types-0.8.2.tgz#947f85346e404332aac6c996d71fd4a89cd7f87a"
integrity sha512-EnzNNLh+9/sJsimsA/FGqzakmrAUKLeJvjRHlg8df1f97NLUlFidk9600y0ZgWOp3CAxn6Hjtk+08tixlUOWyw==
-"@firebase/analytics@0.10.4":
- version "0.10.4"
- resolved "https://registry.yarnpkg.com/@firebase/analytics/-/analytics-0.10.4.tgz#dc68a86774f9ee4f980708e824157617fd2b8ef7"
- integrity sha512-OJEl/8Oye/k+vJ1zV/1L6eGpc1XzAj+WG2TPznJ7PszL7sOFLBXkL9IjHfOCGDGpXeO3btozy/cYUqv4zgNeHg==
- dependencies:
- "@firebase/component" "0.6.7"
- "@firebase/installations" "0.6.7"
- "@firebase/logger" "0.4.2"
- "@firebase/util" "1.9.6"
- tslib "^2.1.0"
-
"@firebase/analytics@0.10.5":
version "0.10.5"
resolved "https://registry.yarnpkg.com/@firebase/analytics/-/analytics-0.10.5.tgz#a455028952bdc25b9da2b0070ebb09ca487ee09f"
@@ -2322,18 +2326,6 @@
"@firebase/util" "1.9.7"
tslib "^2.1.0"
-"@firebase/app-check-compat@0.3.11":
- version "0.3.11"
- resolved "https://registry.yarnpkg.com/@firebase/app-check-compat/-/app-check-compat-0.3.11.tgz#0a5d1c72c91ba239e4dabf6fd698b27f082030ca"
- integrity sha512-t01zaH3RJpKEey0nGduz3Is+uSz7Sj4U5nwOV6lWb+86s5xtxpIvBJzu/lKxJfYyfZ29eJwpdjEgT1/lm4iQyA==
- dependencies:
- "@firebase/app-check" "0.8.4"
- "@firebase/app-check-types" "0.5.2"
- "@firebase/component" "0.6.7"
- "@firebase/logger" "0.4.2"
- "@firebase/util" "1.9.6"
- tslib "^2.1.0"
-
"@firebase/app-check-compat@0.3.12":
version "0.3.12"
resolved "https://registry.yarnpkg.com/@firebase/app-check-compat/-/app-check-compat-0.3.12.tgz#34d826f72e058baf1aad11713fda337046fb863c"
@@ -2356,16 +2348,6 @@
resolved "https://registry.yarnpkg.com/@firebase/app-check-types/-/app-check-types-0.5.2.tgz#1221bd09b471e11bb149252f16640a0a51043cbc"
integrity sha512-FSOEzTzL5bLUbD2co3Zut46iyPWML6xc4x+78TeaXMSuJap5QObfb+rVvZJtla3asN4RwU7elaQaduP+HFizDA==
-"@firebase/app-check@0.8.4":
- version "0.8.4"
- resolved "https://registry.yarnpkg.com/@firebase/app-check/-/app-check-0.8.4.tgz#1c965d34527d1b924fc7bd51789119b3f817bf94"
- integrity sha512-2tjRDaxcM5G7BEpytiDcIl+NovV99q8yEqRMKDbn4J4i/XjjuThuB4S+4PkmTnZiCbdLXQiBhkVxNlUDcfog5Q==
- dependencies:
- "@firebase/component" "0.6.7"
- "@firebase/logger" "0.4.2"
- "@firebase/util" "1.9.6"
- tslib "^2.1.0"
-
"@firebase/app-check@0.8.5":
version "0.8.5"
resolved "https://registry.yarnpkg.com/@firebase/app-check/-/app-check-0.8.5.tgz#e8b0a6d603592f6a04f2d429029f5adfe1a4d2ca"
@@ -2376,17 +2358,6 @@
"@firebase/util" "1.9.7"
tslib "^2.1.0"
-"@firebase/app-compat@0.2.35":
- version "0.2.35"
- resolved "https://registry.yarnpkg.com/@firebase/app-compat/-/app-compat-0.2.35.tgz#ca918736e6b06bdd63eaed24ba213059ecd55f88"
- integrity sha512-vgay/WRjeH0r97/Q6L6df2CMx7oyNFDsE5yPQ9oR1G+zx2eT0s8vNNh0WlKqQxUEWaOLRnXhQ8gy7uu0cBgTRg==
- dependencies:
- "@firebase/app" "0.10.5"
- "@firebase/component" "0.6.7"
- "@firebase/logger" "0.4.2"
- "@firebase/util" "1.9.6"
- tslib "^2.1.0"
-
"@firebase/app-compat@0.2.36":
version "0.2.36"
resolved "https://registry.yarnpkg.com/@firebase/app-compat/-/app-compat-0.2.36.tgz#46926ee9ba0d54fc5ec4695e62588b63e2f7584a"
@@ -2403,17 +2374,6 @@
resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.9.2.tgz#8cbcceba784753a7c0066a4809bc22f93adee080"
integrity sha512-oMEZ1TDlBz479lmABwWsWjzHwheQKiAgnuKxE0pz0IXCVx7/rtlkx1fQ6GfgK24WCrxDKMplZrT50Kh04iMbXQ==
-"@firebase/app@0.10.5":
- version "0.10.5"
- resolved "https://registry.yarnpkg.com/@firebase/app/-/app-0.10.5.tgz#84d3c99b253366844335a411b568dd258800c794"
- integrity sha512-iY/fNot+hWPk9sTX8aHMqlcX9ynRvpGkskWAdUZ2eQQdLo8d1hSFYcYNwPv0Q/frGMasw8udKWMcFOEpC9fG8g==
- dependencies:
- "@firebase/component" "0.6.7"
- "@firebase/logger" "0.4.2"
- "@firebase/util" "1.9.6"
- idb "7.1.1"
- tslib "^2.1.0"
-
"@firebase/app@0.10.6":
version "0.10.6"
resolved "https://registry.yarnpkg.com/@firebase/app/-/app-0.10.6.tgz#0f96a573c18d75723ddeedb45c02c5471d9de695"
@@ -2437,18 +2397,6 @@
tslib "^2.1.0"
undici "5.28.4"
-"@firebase/auth-compat@0.5.9":
- version "0.5.9"
- resolved "https://registry.yarnpkg.com/@firebase/auth-compat/-/auth-compat-0.5.9.tgz#ab925dbe8baf0911fb4836c14403706132d751e8"
- integrity sha512-RX8Zh/3zz2CsVbmYfgHkfUm4fAEPCl+KHVIImNygV5jTGDF6oKOhBIpf4Yigclyu8ESQKZ4elyN0MBYm9/7zGw==
- dependencies:
- "@firebase/auth" "1.7.4"
- "@firebase/auth-types" "0.12.2"
- "@firebase/component" "0.6.7"
- "@firebase/util" "1.9.6"
- tslib "^2.1.0"
- undici "5.28.4"
-
"@firebase/auth-interop-types@0.2.3":
version "0.2.3"
resolved "https://registry.yarnpkg.com/@firebase/auth-interop-types/-/auth-interop-types-0.2.3.tgz#927f1f2139a680b55fef0bddbff2c982b08587e8"
@@ -2459,17 +2407,6 @@
resolved "https://registry.yarnpkg.com/@firebase/auth-types/-/auth-types-0.12.2.tgz#f12d890585866e53b6ab18b16fa4d425c52eee6e"
integrity sha512-qsEBaRMoGvHO10unlDJhaKSuPn4pyoTtlQuP1ghZfzB6rNQPuhp/N/DcFZxm9i4v0SogjCbf9reWupwIvfmH6w==
-"@firebase/auth@1.7.4":
- version "1.7.4"
- resolved "https://registry.yarnpkg.com/@firebase/auth/-/auth-1.7.4.tgz#0dc8083314a61598c91cfe00cb96cf2cb3d74336"
- integrity sha512-d2Fw17s5QesojwebrA903el20Li9/YGgkoOGJjagM4I1qAT36APa/FcZ+OX86KxbYKCtQKTMqraU8pxG7C2JWA==
- dependencies:
- "@firebase/component" "0.6.7"
- "@firebase/logger" "0.4.2"
- "@firebase/util" "1.9.6"
- tslib "^2.1.0"
- undici "5.28.4"
-
"@firebase/auth@1.7.5":
version "1.7.5"
resolved "https://registry.yarnpkg.com/@firebase/auth/-/auth-1.7.5.tgz#8135e0933e874231d7ebafc94f5796a19f5df39b"
@@ -2481,14 +2418,6 @@
tslib "^2.1.0"
undici "5.28.4"
-"@firebase/component@0.6.7":
- version "0.6.7"
- resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.6.7.tgz#6fbffddb26833e1ed58bf296ad587cb330aee716"
- integrity sha512-baH1AA5zxfaz4O8w0vDwETByrKTQqB5CDjRls79Sa4eAGAoERw4Tnung7XbMl3jbJ4B/dmmtsMrdki0KikwDYA==
- dependencies:
- "@firebase/util" "1.9.6"
- tslib "^2.1.0"
-
"@firebase/component@0.6.8":
version "0.6.8"
resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.6.8.tgz#899b9318c0ce0586580e8cda7eaf61296f7fb43b"
@@ -2497,18 +2426,6 @@
"@firebase/util" "1.9.7"
tslib "^2.1.0"
-"@firebase/database-compat@1.0.5":
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/@firebase/database-compat/-/database-compat-1.0.5.tgz#18c2314f169942ac315e46b68f86cbe64bafe063"
- integrity sha512-NDSMaDjQ+TZEMDMmzJwlTL05kh1+0Y84C+kVMaOmNOzRGRM7VHi29I6YUhCetXH+/b1Wh4ZZRyp1CuWkd8s6hg==
- dependencies:
- "@firebase/component" "0.6.7"
- "@firebase/database" "1.0.5"
- "@firebase/database-types" "1.0.3"
- "@firebase/logger" "0.4.2"
- "@firebase/util" "1.9.6"
- tslib "^2.1.0"
-
"@firebase/database-compat@1.0.6":
version "1.0.6"
resolved "https://registry.yarnpkg.com/@firebase/database-compat/-/database-compat-1.0.6.tgz#6a4966fe4a9d8bc2cb11ee98a1bb01ab954d7d66"
@@ -2521,14 +2438,6 @@
"@firebase/util" "1.9.7"
tslib "^2.1.0"
-"@firebase/database-types@1.0.3":
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-1.0.3.tgz#1b764212dce88eca74b16da9d220cfea6814858e"
- integrity sha512-39V/Riv2R3O/aUjYKh0xypj7NTNXNAK1bcgY5Kx+hdQPRS/aPTS8/5c0CGFYKgVuFbYlnlnhrCTYsh2uNhGwzA==
- dependencies:
- "@firebase/app-types" "0.9.2"
- "@firebase/util" "1.9.6"
-
"@firebase/database-types@1.0.4":
version "1.0.4"
resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-1.0.4.tgz#dc507f7838ed29ac3235c68ebae5fd42a562e3e8"
@@ -2537,19 +2446,6 @@
"@firebase/app-types" "0.9.2"
"@firebase/util" "1.9.7"
-"@firebase/database@1.0.5":
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/@firebase/database/-/database-1.0.5.tgz#09d7162b7dbc4533f17498ac6a76d5e757ab45be"
- integrity sha512-cAfwBqMQuW6HbhwI3Cb/gDqZg7aR0OmaJ85WUxlnoYW2Tm4eR0hFl5FEijI3/gYPUiUcUPQvTkGV222VkT7KPw==
- dependencies:
- "@firebase/app-check-interop-types" "0.3.2"
- "@firebase/auth-interop-types" "0.2.3"
- "@firebase/component" "0.6.7"
- "@firebase/logger" "0.4.2"
- "@firebase/util" "1.9.6"
- faye-websocket "0.11.4"
- tslib "^2.1.0"
-
"@firebase/database@1.0.6":
version "1.0.6"
resolved "https://registry.yarnpkg.com/@firebase/database/-/database-1.0.6.tgz#cf0592b140e207e35c14efe6776fc92266ac408a"
@@ -2563,17 +2459,6 @@
faye-websocket "0.11.4"
tslib "^2.1.0"
-"@firebase/firestore-compat@0.3.32":
- version "0.3.32"
- resolved "https://registry.yarnpkg.com/@firebase/firestore-compat/-/firestore-compat-0.3.32.tgz#1357ba5f80b83f33210d4fb49a1cd346cf95b291"
- integrity sha512-at71mwK7a/mUXH0OgyY0+gUzedm/EUydDFYSFsBoO8DYowZ23Mgd6P4Rzq/Ll3zI/3xJN7LGe7Qp4iE/V/3Arg==
- dependencies:
- "@firebase/component" "0.6.7"
- "@firebase/firestore" "4.6.3"
- "@firebase/firestore-types" "3.0.2"
- "@firebase/util" "1.9.6"
- tslib "^2.1.0"
-
"@firebase/firestore-compat@0.3.33":
version "0.3.33"
resolved "https://registry.yarnpkg.com/@firebase/firestore-compat/-/firestore-compat-0.3.33.tgz#8e591bfafb574c695b09101b98c1a1057f55c60e"
@@ -2590,20 +2475,6 @@
resolved "https://registry.yarnpkg.com/@firebase/firestore-types/-/firestore-types-3.0.2.tgz#75c301acc5fa33943eaaa9570b963c55398cad2a"
integrity sha512-wp1A+t5rI2Qc/2q7r2ZpjUXkRVPtGMd6zCLsiWurjsQpqPgFin3AhNibKcIzoF2rnToNa/XYtyWXuifjOOwDgg==
-"@firebase/firestore@4.6.3":
- version "4.6.3"
- resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-4.6.3.tgz#87ad38dfd0a0f16e79682177102ee1328d59af44"
- integrity sha512-d/+N2iUsiJ/Dc7fApdpdmmTXzwuTCromsdA1lKwYfZtMIOd1fI881NSLwK2wV4I38wkLnvfKJUV6WpU1f3/ONg==
- dependencies:
- "@firebase/component" "0.6.7"
- "@firebase/logger" "0.4.2"
- "@firebase/util" "1.9.6"
- "@firebase/webchannel-wrapper" "1.0.0"
- "@grpc/grpc-js" "~1.9.0"
- "@grpc/proto-loader" "^0.7.8"
- tslib "^2.1.0"
- undici "5.28.4"
-
"@firebase/firestore@4.6.4":
version "4.6.4"
resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-4.6.4.tgz#f53fcfc3ecfeb844f2147a43382d013d21e64968"
@@ -2618,17 +2489,6 @@
tslib "^2.1.0"
undici "5.28.4"
-"@firebase/functions-compat@0.3.11":
- version "0.3.11"
- resolved "https://registry.yarnpkg.com/@firebase/functions-compat/-/functions-compat-0.3.11.tgz#9fdff8b174879b404501df7b8b519e5fb6d0b8ec"
- integrity sha512-Qn+ts/M6Lj2/6i1cp5V5TRR+Hi9kyXyHbo+w9GguINJ87zxrCe6ulx3TI5AGQkoQa8YFHUhT3DMGmLFiJjWTSQ==
- dependencies:
- "@firebase/component" "0.6.7"
- "@firebase/functions" "0.11.5"
- "@firebase/functions-types" "0.6.2"
- "@firebase/util" "1.9.6"
- tslib "^2.1.0"
-
"@firebase/functions-compat@0.3.12":
version "0.3.12"
resolved "https://registry.yarnpkg.com/@firebase/functions-compat/-/functions-compat-0.3.12.tgz#aae387eb48466df1d031fc5bb755c657cfeb5994"
@@ -2645,19 +2505,6 @@
resolved "https://registry.yarnpkg.com/@firebase/functions-types/-/functions-types-0.6.2.tgz#03b4ec9259d2f57548a3909d6a35ae35ad243552"
integrity sha512-0KiJ9lZ28nS2iJJvimpY4nNccV21rkQyor5Iheu/nq8aKXJqtJdeSlZDspjPSBBiHRzo7/GMUttegnsEITqR+w==
-"@firebase/functions@0.11.5":
- version "0.11.5"
- resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.11.5.tgz#e4187ae3ae262b0482114f7ad418600ca84f3459"
- integrity sha512-qrHJ+l62mZiU5UZiVi84t/iLXZlhRuSvBQsa2qvNLgPsEWR7wdpWhRmVdB7AU8ndkSHJjGlMICqrVnz47sgU7Q==
- dependencies:
- "@firebase/app-check-interop-types" "0.3.2"
- "@firebase/auth-interop-types" "0.2.3"
- "@firebase/component" "0.6.7"
- "@firebase/messaging-interop-types" "0.2.2"
- "@firebase/util" "1.9.6"
- tslib "^2.1.0"
- undici "5.28.4"
-
"@firebase/functions@0.11.6":
version "0.11.6"
resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.11.6.tgz#607991a3a870051e6456d7ccb0217fac6305db89"
@@ -2671,17 +2518,6 @@
tslib "^2.1.0"
undici "5.28.4"
-"@firebase/installations-compat@0.2.7":
- version "0.2.7"
- resolved "https://registry.yarnpkg.com/@firebase/installations-compat/-/installations-compat-0.2.7.tgz#c430f34bfcfc008c92ca32fd11d6c84ab5dd7888"
- integrity sha512-RPcbD+3nqHbnhVjIOpWK2H5qzZ8pAAAScceiWph0VNTqpKyPQ5tDcp4V5fS0ELpfgsHYvroMLDKfeHxpfvm8cw==
- dependencies:
- "@firebase/component" "0.6.7"
- "@firebase/installations" "0.6.7"
- "@firebase/installations-types" "0.5.2"
- "@firebase/util" "1.9.6"
- tslib "^2.1.0"
-
"@firebase/installations-compat@0.2.8":
version "0.2.8"
resolved "https://registry.yarnpkg.com/@firebase/installations-compat/-/installations-compat-0.2.8.tgz#ebc908afe84db2754b19a62f7655608911e13819"
@@ -2698,16 +2534,6 @@
resolved "https://registry.yarnpkg.com/@firebase/installations-types/-/installations-types-0.5.2.tgz#4d4949e0e83ced7f36cbee009355cd305a36e158"
integrity sha512-que84TqGRZJpJKHBlF2pkvc1YcXrtEDOVGiDjovP/a3s6W4nlbohGXEsBJo0JCeeg/UG9A+DEZVDUV9GpklUzA==
-"@firebase/installations@0.6.7":
- version "0.6.7"
- resolved "https://registry.yarnpkg.com/@firebase/installations/-/installations-0.6.7.tgz#4fc60ca86e838d7c45dfd1d4926d000060bd1079"
- integrity sha512-i6iGoXRu5mX4rTsiMSSKrgh9pSEzD4hwBEzRh5kEhOTr8xN/wvQcCPZDSMVYKwM2XyCPBLVq0JzjyerwL0Rihg==
- dependencies:
- "@firebase/component" "0.6.7"
- "@firebase/util" "1.9.6"
- idb "7.1.1"
- tslib "^2.1.0"
-
"@firebase/installations@0.6.8":
version "0.6.8"
resolved "https://registry.yarnpkg.com/@firebase/installations/-/installations-0.6.8.tgz#f9c9d493bce04b04ca28814e926ef3ed71f033d6"
@@ -2735,16 +2561,6 @@
"@firebase/util" "1.9.7"
tslib "^2.1.0"
-"@firebase/messaging-compat@0.2.9":
- version "0.2.9"
- resolved "https://registry.yarnpkg.com/@firebase/messaging-compat/-/messaging-compat-0.2.9.tgz#a4cae54c9caf10a3a6c811152d5bd58f165337b7"
- integrity sha512-5jN6wyhwPgBH02zOtmmoOeyfsmoD7ty48D1m0vVPsFg55RqN2Z3Q9gkZ5GmPklFPjTPLcxB1ObcHOZvThTkm7g==
- dependencies:
- "@firebase/component" "0.6.7"
- "@firebase/messaging" "0.12.9"
- "@firebase/util" "1.9.6"
- tslib "^2.1.0"
-
"@firebase/messaging-interop-types@0.2.2":
version "0.2.2"
resolved "https://registry.yarnpkg.com/@firebase/messaging-interop-types/-/messaging-interop-types-0.2.2.tgz#81042f7e9739733fa4571d17f6eb6869522754d0"
@@ -2762,30 +2578,6 @@
idb "7.1.1"
tslib "^2.1.0"
-"@firebase/messaging@0.12.9":
- version "0.12.9"
- resolved "https://registry.yarnpkg.com/@firebase/messaging/-/messaging-0.12.9.tgz#c3cb7a26a3488161273839bf65237f8c485ba661"
- integrity sha512-IH+JJmzbFGZXV3+TDyKdqqKPVfKRqBBg2BfYYOy7cm7J+SwV+uJMe8EnDKYeQLEQhtpwciPfJ3qQXJs2lbxDTw==
- dependencies:
- "@firebase/component" "0.6.7"
- "@firebase/installations" "0.6.7"
- "@firebase/messaging-interop-types" "0.2.2"
- "@firebase/util" "1.9.6"
- idb "7.1.1"
- tslib "^2.1.0"
-
-"@firebase/performance-compat@0.2.7":
- version "0.2.7"
- resolved "https://registry.yarnpkg.com/@firebase/performance-compat/-/performance-compat-0.2.7.tgz#30e29934326888b164c67e5f3709c3a8e580a8d6"
- integrity sha512-cb8ge/5iTstxfIGW+iiY+7l3FtN8gobNh9JSQNZgLC9xmcfBYWEs8IeEWMI6S8T+At0oHc3lv+b2kpRMUWr8zQ==
- dependencies:
- "@firebase/component" "0.6.7"
- "@firebase/logger" "0.4.2"
- "@firebase/performance" "0.6.7"
- "@firebase/performance-types" "0.2.2"
- "@firebase/util" "1.9.6"
- tslib "^2.1.0"
-
"@firebase/performance-compat@0.2.8":
version "0.2.8"
resolved "https://registry.yarnpkg.com/@firebase/performance-compat/-/performance-compat-0.2.8.tgz#d97bab3fd0c147c7f796e9b8f78712bc0b83699c"
@@ -2803,17 +2595,6 @@
resolved "https://registry.yarnpkg.com/@firebase/performance-types/-/performance-types-0.2.2.tgz#7b78cd2ab2310bac89a63348d93e67e01eb06dd7"
integrity sha512-gVq0/lAClVH5STrIdKnHnCo2UcPLjJlDUoEB/tB4KM+hAeHUxWKnpT0nemUPvxZ5nbdY/pybeyMe8Cs29gEcHA==
-"@firebase/performance@0.6.7":
- version "0.6.7"
- resolved "https://registry.yarnpkg.com/@firebase/performance/-/performance-0.6.7.tgz#7d6c4e5ec61df7369d87fb4a5c0af4e0cedee69b"
- integrity sha512-d+Q4ltjdJZqjzcdms5i0UC9KLYX7vKGcygZ+7zHA/Xk+bAbMD2CPU0nWTnlNFWifZWIcXZ/2mAMvaGMW3lypUA==
- dependencies:
- "@firebase/component" "0.6.7"
- "@firebase/installations" "0.6.7"
- "@firebase/logger" "0.4.2"
- "@firebase/util" "1.9.6"
- tslib "^2.1.0"
-
"@firebase/performance@0.6.8":
version "0.6.8"
resolved "https://registry.yarnpkg.com/@firebase/performance/-/performance-0.6.8.tgz#668b0fc207389f7829fd3bfb6614fe819b7db124"
@@ -2825,18 +2606,6 @@
"@firebase/util" "1.9.7"
tslib "^2.1.0"
-"@firebase/remote-config-compat@0.2.7":
- version "0.2.7"
- resolved "https://registry.yarnpkg.com/@firebase/remote-config-compat/-/remote-config-compat-0.2.7.tgz#8a7ac7658a7c9cc29a4ad5884bc224eaae950c38"
- integrity sha512-Fq0oneQ4SluLnfr5/HfzRS1TZf1ANj1rWbCCW3+oC98An3nE+sCdp+FSuHsEVNwgMg4Tkwx9Oom2lkKeU+Vn+w==
- dependencies:
- "@firebase/component" "0.6.7"
- "@firebase/logger" "0.4.2"
- "@firebase/remote-config" "0.4.7"
- "@firebase/remote-config-types" "0.3.2"
- "@firebase/util" "1.9.6"
- tslib "^2.1.0"
-
"@firebase/remote-config-compat@0.2.8":
version "0.2.8"
resolved "https://registry.yarnpkg.com/@firebase/remote-config-compat/-/remote-config-compat-0.2.8.tgz#a6df065c1fd0a943e84ee0e76acfc6c1bede42f9"
@@ -2854,17 +2623,6 @@
resolved "https://registry.yarnpkg.com/@firebase/remote-config-types/-/remote-config-types-0.3.2.tgz#a5d1009c6fd08036c5cd4f28764e3cd694f966d5"
integrity sha512-0BC4+Ud7y2aPTyhXJTMTFfrGGLqdYXrUB9sJVAB8NiqJswDTc4/2qrE/yfUbnQJhbSi6ZaTTBKyG3n1nplssaA==
-"@firebase/remote-config@0.4.7":
- version "0.4.7"
- resolved "https://registry.yarnpkg.com/@firebase/remote-config/-/remote-config-0.4.7.tgz#1afd6f3089e3c66ed6909eb60d0eb1329d27c9ff"
- integrity sha512-5oPNrPFLsbsjpq0lUEIXoDF2eJK7vAbyXe/DEuZQxnwJlfR7aQbtUlEkRgQWcicXpyDmAmDLo7q7lDbCYa6CpA==
- dependencies:
- "@firebase/component" "0.6.7"
- "@firebase/installations" "0.6.7"
- "@firebase/logger" "0.4.2"
- "@firebase/util" "1.9.6"
- tslib "^2.1.0"
-
"@firebase/remote-config@0.4.8":
version "0.4.8"
resolved "https://registry.yarnpkg.com/@firebase/remote-config/-/remote-config-0.4.8.tgz#b6a79acdf73554e0ee31c278162b85592fc8c1f3"
@@ -2876,17 +2634,6 @@
"@firebase/util" "1.9.7"
tslib "^2.1.0"
-"@firebase/storage-compat@0.3.8":
- version "0.3.8"
- resolved "https://registry.yarnpkg.com/@firebase/storage-compat/-/storage-compat-0.3.8.tgz#0d6d66a683713953b2bd24494e83bddcbb562f3a"
- integrity sha512-qDfY9kMb6Ch2hZb40sBjDQ8YPxbjGOxuT+gU1Z0iIVSSpSX0f4YpGJCypUXiA0T11n6InCXB+T/Dknh2yxVTkg==
- dependencies:
- "@firebase/component" "0.6.7"
- "@firebase/storage" "0.12.5"
- "@firebase/storage-types" "0.8.2"
- "@firebase/util" "1.9.6"
- tslib "^2.1.0"
-
"@firebase/storage-compat@0.3.9":
version "0.3.9"
resolved "https://registry.yarnpkg.com/@firebase/storage-compat/-/storage-compat-0.3.9.tgz#42496a7b5f7c384f0ea590d704934465102b4527"
@@ -2903,16 +2650,6 @@
resolved "https://registry.yarnpkg.com/@firebase/storage-types/-/storage-types-0.8.2.tgz#edb321b8a3872a9f74e1f27de046f160021c8e1f"
integrity sha512-0vWu99rdey0g53lA7IShoA2Lol1jfnPovzLDUBuon65K7uKG9G+L5uO05brD9pMw+l4HRFw23ah3GwTGpEav6g==
-"@firebase/storage@0.12.5":
- version "0.12.5"
- resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.12.5.tgz#9277b4f838572ba78f017aa6207c6d7545400846"
- integrity sha512-nGWBOGFNr10j0LA4NJ3/Yh3us/lb0Q1xSIKZ38N6FcS+vY54nqJ7k3zE3PENregHC8+8txRow++A568G3v8hOA==
- dependencies:
- "@firebase/component" "0.6.7"
- "@firebase/util" "1.9.6"
- tslib "^2.1.0"
- undici "5.28.4"
-
"@firebase/storage@0.12.6":
version "0.12.6"
resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.12.6.tgz#49b2c77f10fd97da913a93e37c86cdff92a805eb"
@@ -2923,13 +2660,6 @@
tslib "^2.1.0"
undici "5.28.4"
-"@firebase/util@1.9.6":
- version "1.9.6"
- resolved "https://registry.yarnpkg.com/@firebase/util/-/util-1.9.6.tgz#56dc34e20fcbc0dd07b11b800f95f5d0417cbfb4"
- integrity sha512-IBr1MZbp4d5MjBCXL3TW1dK/PDXX4yOGbiwRNh1oAbE/+ci5Uuvy9KIrsFYY80as1I0iOaD5oOMA9Q8j4TJWcw==
- dependencies:
- tslib "^2.1.0"
-
"@firebase/util@1.9.7":
version "1.9.7"
resolved "https://registry.yarnpkg.com/@firebase/util/-/util-1.9.7.tgz#c03b0ae065b3bba22800da0bd5314ef030848038"
@@ -2937,17 +2667,6 @@
dependencies:
tslib "^2.1.0"
-"@firebase/vertexai-preview@0.0.2":
- version "0.0.2"
- resolved "https://registry.yarnpkg.com/@firebase/vertexai-preview/-/vertexai-preview-0.0.2.tgz#a17454e4899bf4b3fa07322fb204659e7cfa5868"
- integrity sha512-NOOL63kFQRq45ioi5P+hlqj/4LNmvn1URhGjQdvyV54c1Irvoq26aW861PRRLjrSMIeNeiLtCLD5pe+ediepAg==
- dependencies:
- "@firebase/app-check-interop-types" "0.3.2"
- "@firebase/component" "0.6.7"
- "@firebase/logger" "0.4.2"
- "@firebase/util" "1.9.6"
- tslib "^2.1.0"
-
"@firebase/vertexai-preview@0.0.3":
version "0.0.3"
resolved "https://registry.yarnpkg.com/@firebase/vertexai-preview/-/vertexai-preview-0.0.3.tgz#73dea839439ebdbb5ccd946f297ede5b57e6e7e9"
@@ -2959,11 +2678,6 @@
"@firebase/util" "1.9.7"
tslib "^2.1.0"
-"@firebase/webchannel-wrapper@1.0.0":
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-1.0.0.tgz#a0e11b39fa3ef56ed5333bf321f581037aeda033"
- integrity sha512-zuWxyfXNbsKbm96HhXzainONPFqRcoZblQ++e9cAIGUuHfl2cFSBzW01jtesqWG/lqaUyX3H8O1y9oWboGNQBA==
-
"@firebase/webchannel-wrapper@1.0.1":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-1.0.1.tgz#0b62c9f47f557a5b4adc073bb0a47542ce6af4c4"
@@ -4287,39 +4001,39 @@
resolved "https://registry.yarnpkg.com/@mantine/hooks/-/hooks-7.8.0.tgz#fc32e07746689459c4b049dc581d1dbda5545686"
integrity sha512-+70fkgjhVJeJ+nJqnburIM3UAsfvxat1Low9HMPobLbv64FIdB4Nzu5ct3qojNQ58r5sK01tg5UoFIJYslaVrg==
-"@metamask/abi-utils@^2.0.2", "@metamask/abi-utils@^2.0.4":
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/@metamask/abi-utils/-/abi-utils-2.0.4.tgz#20908c1d910f7a17a89fdf5778a5c59d5cb8b8be"
- integrity sha512-StnIgUB75x7a7AgUhiaUZDpCsqGp7VkNnZh2XivXkJ6mPkE83U8ARGQj5MbRis7VJY8BC5V1AbB1fjdh0hupPQ==
+"@metamask/abi-utils@^2.0.2":
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/@metamask/abi-utils/-/abi-utils-2.0.2.tgz#ad394e9cb8a95ac177cad942daadd88a246c0de8"
+ integrity sha512-B/A1dY/w4F/t6cDHUscklO6ovb/ztFsrsTXFd8QlqSByk/vyy+QbPE3VVpmmyI/7RX+PA1AJcvBdzCIz+r9dVQ==
dependencies:
- "@metamask/superstruct" "^3.1.0"
- "@metamask/utils" "^9.0.0"
+ "@metamask/utils" "^8.0.0"
+ superstruct "^1.0.3"
-"@metamask/accounts-controller@^14.0.0", "@metamask/accounts-controller@^17.2.0", "@metamask/accounts-controller@^18.1.0", "@metamask/accounts-controller@^18.2.1":
- version "18.2.1"
- resolved "https://registry.yarnpkg.com/@metamask/accounts-controller/-/accounts-controller-18.2.1.tgz#8e4a842316e9b7bbd0409b36129f7123ba4a4c79"
- integrity sha512-BEvux+ZFpTOQa6HbRl7i7Tq24ztqrZIsX+H0ePh47lU+N8RWq1q0JCItV+zbsgdcYnwhtcMZTsp4jJPQwPe2og==
+"@metamask/accounts-controller@^14.0.0", "@metamask/accounts-controller@^17.2.0", "@metamask/accounts-controller@^18.1.0":
+ version "18.1.0"
+ resolved "https://registry.yarnpkg.com/@metamask/accounts-controller/-/accounts-controller-18.1.0.tgz#a832f331065f888cab53645bdadc86449b38ce1a"
+ integrity sha512-vZPa8kyo8ThEme/67HO6XzHHhvc4pGOLexNrtsS9EK+QBww1EgrwM42mAkKYZmlgbLCoCKCvzQI/CK1URqw5zg==
dependencies:
"@ethereumjs/util" "^8.1.0"
- "@metamask/base-controller" "^7.0.1"
- "@metamask/eth-snap-keyring" "^4.3.3"
+ "@metamask/base-controller" "^6.0.3"
+ "@metamask/eth-snap-keyring" "^4.3.1"
"@metamask/keyring-api" "^8.1.0"
- "@metamask/snaps-sdk" "^6.5.0"
- "@metamask/snaps-utils" "^8.1.1"
+ "@metamask/snaps-sdk" "^6.1.1"
+ "@metamask/snaps-utils" "^7.8.1"
"@metamask/utils" "^9.1.0"
deepmerge "^4.2.2"
ethereum-cryptography "^2.1.2"
immer "^9.0.6"
uuid "^8.3.2"
-"@metamask/address-book-controller@^6.0.1":
- version "6.0.1"
- resolved "https://registry.yarnpkg.com/@metamask/address-book-controller/-/address-book-controller-6.0.1.tgz#39e432f24e71b019bc600b39c813500b2e950f22"
- integrity sha512-t/fQ6ha/f5RfJRFUkkm9uWYSGdVcvF0LbJ+TzpJ9Jn0fENnZg6sdVxJd2orCwpHFic9gRPKBB0DMXObdjcVqrw==
+"@metamask/address-book-controller@^4.0.1":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@metamask/address-book-controller/-/address-book-controller-4.0.1.tgz#78a841e97b7db0058e6796590eb07444c750d13f"
+ integrity sha512-ooQRuPP5Tm/vLvajwhZdmEoAGEx9/z2UyjvAZwY0AgEe1XK2ry6XbNHV/NH/9l559G+dwMXtM/oybt6d7yiy9Q==
dependencies:
- "@metamask/base-controller" "^7.0.1"
- "@metamask/controller-utils" "^11.3.0"
- "@metamask/utils" "^9.1.0"
+ "@metamask/base-controller" "^5.0.1"
+ "@metamask/controller-utils" "^9.0.1"
+ "@metamask/utils" "^8.3.0"
"@metamask/approval-controller@^6.0.2":
version "6.0.2"
@@ -4391,7 +4105,7 @@
"@metamask/utils" "^8.3.0"
immer "^9.0.6"
-"@metamask/base-controller@^5.0.2":
+"@metamask/base-controller@^5.0.1", "@metamask/base-controller@^5.0.2":
version "5.0.2"
resolved "https://registry.yarnpkg.com/@metamask/base-controller/-/base-controller-5.0.2.tgz#ab3584f67d9f2ff80958df21558e61650074e565"
integrity sha512-izOaXXnLz9OXbdika0ZvIDf24pgsWNPI02Lm0E4eMU61ICpV78bzQB7YyIbMtF6MWnItw1RnX9jN6zNEmp5pdA==
@@ -4399,7 +4113,7 @@
"@metamask/utils" "^8.3.0"
immer "^9.0.6"
-"@metamask/base-controller@^6.0.0", "@metamask/base-controller@^6.0.2":
+"@metamask/base-controller@^6.0.0", "@metamask/base-controller@^6.0.2", "@metamask/base-controller@^6.0.3":
version "6.0.3"
resolved "https://registry.yarnpkg.com/@metamask/base-controller/-/base-controller-6.0.3.tgz#9bb4e74234c1de5f99842c343ffa053c08055db1"
integrity sha512-neUqsCXRT6QYcZO51y6Y5u9NPTHuxgNsW5Z4h///o1gDdV8lBeIG/b1ne+QPK422DZMAm4ChnkG1DDNf4PkErw==
@@ -4492,7 +4206,7 @@
eth-ens-namehash "^2.0.8"
fast-deep-equal "^3.1.3"
-"@metamask/controller-utils@^9.1.0":
+"@metamask/controller-utils@^9.0.1", "@metamask/controller-utils@^9.1.0":
version "9.1.0"
resolved "https://registry.yarnpkg.com/@metamask/controller-utils/-/controller-utils-9.1.0.tgz#436ff37d339df3f4b0f31458881c6f1b1002c945"
integrity sha512-17XQhyhR1bC7NjQHJF2KhxStVeoFW8liQ/Z526cI3uVcKOgYRxxDwBiRGs+xzv9XAm7f1W73W83wnb8fcBxlxg==
@@ -4628,14 +4342,14 @@
json-rpc-random-id "^1.0.0"
xtend "^4.0.1"
-"@metamask/eth-sig-util@^7.0.0", "@metamask/eth-sig-util@^7.0.1", "@metamask/eth-sig-util@^7.0.2", "@metamask/eth-sig-util@^7.0.3":
- version "7.0.3"
- resolved "https://registry.yarnpkg.com/@metamask/eth-sig-util/-/eth-sig-util-7.0.3.tgz#be9e444fe0b8474c04e2ff42fd983173767f6ac0"
- integrity sha512-PAtGnOkYvh90k2lEZldq/FK7GTLF6WxE+2bV85PoA3pqlJnmJCAY62tuvxHSwnVngSKlc4mcNvjnUg2eYO6JGg==
+"@metamask/eth-sig-util@^7.0.0", "@metamask/eth-sig-util@^7.0.1", "@metamask/eth-sig-util@^7.0.2":
+ version "7.0.2"
+ resolved "https://registry.yarnpkg.com/@metamask/eth-sig-util/-/eth-sig-util-7.0.2.tgz#741de634b0d6ca96ce1ee3d064ac6a27756d8d21"
+ integrity sha512-DhTDMNEtED0ihIc4Tysm6qUJTvArCdgSTeeJWdo526W/cAk5mrSAvEYYgv8idAiBumDtcPWGimMTaB7MvY64bg==
dependencies:
"@ethereumjs/util" "^8.1.0"
- "@metamask/abi-utils" "^2.0.4"
- "@metamask/utils" "^9.0.0"
+ "@metamask/abi-utils" "^2.0.2"
+ "@metamask/utils" "^8.1.0"
"@scure/base" "~1.1.3"
ethereum-cryptography "^2.1.2"
tweetnacl "^1.0.3"
@@ -4651,21 +4365,20 @@
ethereum-cryptography "^2.1.2"
randombytes "^2.1.0"
-"@metamask/eth-snap-keyring@^4.3.3":
- version "4.3.4"
- resolved "https://registry.yarnpkg.com/@metamask/eth-snap-keyring/-/eth-snap-keyring-4.3.4.tgz#78308770d421f6f3c9d24dba925acf87a54012e8"
- integrity sha512-y68ksrkwZJ7J5Edej+XvTDR04CwZs0BHjOVpJbnA/328P75Gs7jSHWqOE7DtziMbwpVsFlgBMTVFPsSyrh8Fmg==
+"@metamask/eth-snap-keyring@^4.3.1":
+ version "4.3.1"
+ resolved "https://registry.yarnpkg.com/@metamask/eth-snap-keyring/-/eth-snap-keyring-4.3.1.tgz#f597c7059f499b3cb72ef73b89949231c567d432"
+ integrity sha512-led5tGBeJUj4DdkMtbbjrbrFGQKKOWfWe7VZ1w99DYKqMv0v/RiJOoxPs8dT6ez7NS9J6SBaWO9i/ly3KMhECg==
dependencies:
"@ethereumjs/tx" "^4.2.0"
- "@metamask/eth-sig-util" "^7.0.3"
- "@metamask/keyring-api" "^8.1.0"
- "@metamask/snaps-controllers" "^9.6.0"
- "@metamask/snaps-sdk" "^6.4.0"
- "@metamask/snaps-utils" "^7.8.0"
- "@metamask/superstruct" "^3.1.0"
- "@metamask/utils" "^9.1.0"
+ "@metamask/eth-sig-util" "^7.0.1"
+ "@metamask/keyring-api" "^8.0.0"
+ "@metamask/snaps-controllers" "^8.1.1"
+ "@metamask/snaps-sdk" "^4.2.0"
+ "@metamask/snaps-utils" "^7.4.0"
+ "@metamask/utils" "^8.4.0"
"@types/uuid" "^9.0.1"
- deepmerge "^4.2.2"
+ superstruct "^1.0.3"
uuid "^9.0.0"
"@metamask/etherscan-link@^2.0.0":
@@ -4861,7 +4574,7 @@
superstruct "^1.0.3"
uuid "^9.0.1"
-"@metamask/keyring-api@^8.1.0":
+"@metamask/keyring-api@^8.0.0", "@metamask/keyring-api@^8.1.0":
version "8.1.0"
resolved "https://registry.yarnpkg.com/@metamask/keyring-api/-/keyring-api-8.1.0.tgz#e4157550189797fae89557c37315dc47d4c23bed"
integrity sha512-w/B1ulJvyxQBZoJMpSsHFtrL8kbdwFc2ryjEcAgMZ3V0PNyW2urY0f9v/majYAVkPhQcN1t0AUwv8NcOSigGqg==
@@ -4873,7 +4586,7 @@
bech32 "^2.0.0"
uuid "^9.0.1"
-"@metamask/keyring-controller@^16.0.0":
+"@metamask/keyring-controller@^16.0.0", "@metamask/keyring-controller@^16.1.0":
version "16.1.0"
resolved "https://registry.yarnpkg.com/@metamask/keyring-controller/-/keyring-controller-16.1.0.tgz#f15e9a0fd0242dc049e964d0a72d0f2ce00d3463"
integrity sha512-R0ceCSu8QmoY5HWvXw5VyyfzBwITQuRme4KqbYRuMEVhcJ2KqAhjZEmHnEfHCNpd7fu6O2vRPkqEIz/j4H6Gfw==
@@ -4892,45 +4605,22 @@
ethereumjs-wallet "^1.0.1"
immer "^9.0.6"
-"@metamask/keyring-controller@^17.2.1":
- version "17.2.1"
- resolved "https://registry.yarnpkg.com/@metamask/keyring-controller/-/keyring-controller-17.2.1.tgz#3625650e18b80af3f9a1227fc7ca106adf77f5f3"
- integrity sha512-9GDrP3jK5uM5e1mX/qHkvjuByAtkf7ZiJoeYRE5OIo0OAYFwMAeFw2JlIdWB+BR6CT8C0KEXo+Ne/5ZTn+HCqA==
- dependencies:
- "@ethereumjs/util" "^8.1.0"
- "@keystonehq/metamask-airgapped-keyring" "^0.14.1"
- "@metamask/base-controller" "^7.0.1"
- "@metamask/browser-passworder" "^4.3.0"
- "@metamask/eth-hd-keyring" "^7.0.1"
- "@metamask/eth-sig-util" "^7.0.1"
- "@metamask/eth-simple-keyring" "^6.0.1"
- "@metamask/keyring-api" "^8.1.0"
- "@metamask/message-manager" "^10.1.1"
- "@metamask/utils" "^9.1.0"
- async-mutex "^0.5.0"
- ethereumjs-wallet "^1.0.1"
- immer "^9.0.6"
-
-"@metamask/logging-controller@^6.0.1":
- version "6.0.1"
- resolved "https://registry.yarnpkg.com/@metamask/logging-controller/-/logging-controller-6.0.1.tgz#cfe858e91ba6fa490ebcf4e50bebd5f6dee0417e"
- integrity sha512-oZgXsWUf22tjMsZUeLf5INQMGN0sDL5toyuqfdmVfERZt5x4H9TxH9hcBN6M7TfYkXiY8O3kDE2JLkTLnEEvnw==
+"@metamask/logging-controller@^3.0.0":
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/@metamask/logging-controller/-/logging-controller-3.0.1.tgz#11c2b127bc2d7d4b753e2d757b0c09bf2742bf0a"
+ integrity sha512-+rIkpsLnBeTbx7IoL998E1/LgBbNP/1TPg6hlTbLUuXgKj6C/XFO47tMPxQOp7Ut8njVfKAkLV5QqtB+4rKHkg==
dependencies:
- "@metamask/base-controller" "^7.0.1"
- "@metamask/controller-utils" "^11.3.0"
+ "@metamask/base-controller" "^5.0.1"
+ "@metamask/controller-utils" "^9.0.1"
uuid "^8.3.2"
-"@metamask/message-manager@^10.1.1":
- version "10.1.1"
- resolved "https://registry.yarnpkg.com/@metamask/message-manager/-/message-manager-10.1.1.tgz#390acc4dff9f7c72aaf5c183397c872e53ae7f12"
- integrity sha512-VFFqEPKOyo59P79CP/vlPDpMng1a1mMHIaXuvEJYTOf/UOqeVpw77G5IHVfjuG+tZNlAQIHYp7sEmPkob+rzcA==
+"@metamask/logging-controller@^4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@metamask/logging-controller/-/logging-controller-4.0.0.tgz#313d44f4967ac51549271739c4edfc65be86214d"
+ integrity sha512-LBFybTQUzHUGNLth8S2eNiTPPBcTDU48iKyKYKM2m0mNOOmjx3T2PGJOnUrYBBDXs8VktejGtUTT50mMwuLYEg==
dependencies:
- "@metamask/base-controller" "^7.0.1"
- "@metamask/controller-utils" "^11.3.0"
- "@metamask/eth-sig-util" "^7.0.1"
- "@metamask/utils" "^9.1.0"
- "@types/uuid" "^8.3.0"
- jsonschema "^1.2.4"
+ "@metamask/base-controller" "^5.0.2"
+ "@metamask/controller-utils" "^10.0.0"
uuid "^8.3.2"
"@metamask/message-manager@^9.0.0":
@@ -5058,15 +4748,16 @@
"@ethersproject/providers" "^5.7.2"
async-mutex "^0.3.1"
-"@metamask/notification-services-controller@^0.8.0":
- version "0.8.0"
- resolved "https://registry.yarnpkg.com/@metamask/notification-services-controller/-/notification-services-controller-0.8.0.tgz#f57943f364b22c679d692df7048355bbd557cc31"
- integrity sha512-S1PrCwe6k4wv32qvpfueeSVjWp/AMMizLWGBzsbLaM3ElkK+aAeVkP0UARuHHt/IlXxvbpjeSvYIe8GINPn9Pw==
+"@metamask/notification-services-controller@^0.2.1":
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/@metamask/notification-services-controller/-/notification-services-controller-0.2.1.tgz#aa36275d20f71297d73c33055e88bf55b33ac4d9"
+ integrity sha512-TvQAiA38a8j0r7amNQivi4itFFfuNAGrCWJUGbKqyu/rZiS2itTFLXchhazGu1H8TK3lxOx9r7C/RfRYwkuDpA==
dependencies:
"@contentful/rich-text-html-renderer" "^16.5.2"
- "@metamask/base-controller" "^7.0.1"
- "@metamask/controller-utils" "^11.3.0"
+ "@metamask/base-controller" "^6.0.2"
+ "@metamask/controller-utils" "^11.0.2"
bignumber.js "^4.1.0"
+ contentful "^10.3.6"
firebase "^10.11.0"
loglevel "^1.8.1"
uuid "^8.3.2"
@@ -5142,7 +4833,34 @@
immer "^9.0.6"
nanoid "^3.1.31"
-"@metamask/phishing-controller@^12.0.2", "@metamask/phishing-controller@^12.0.3":
+"@metamask/permission-controller@^9.0.2":
+ version "9.1.1"
+ resolved "https://registry.yarnpkg.com/@metamask/permission-controller/-/permission-controller-9.1.1.tgz#de8c15438afa4ef65e419c20f358799924fc3f2c"
+ integrity sha512-h4EakReO5JFDZBIAjXXOiwaMGqrQvNp6/6kQfDYREvT+tIpjGD5JUaqgwBblLkPCLeip57hIqxeobPlgmCfATA==
+ dependencies:
+ "@metamask/base-controller" "^5.0.2"
+ "@metamask/controller-utils" "^10.0.0"
+ "@metamask/json-rpc-engine" "^8.0.2"
+ "@metamask/rpc-errors" "^6.2.1"
+ "@metamask/utils" "^8.3.0"
+ "@types/deep-freeze-strict" "^1.1.0"
+ deep-freeze-strict "^1.1.1"
+ immer "^9.0.6"
+ nanoid "^3.1.31"
+
+"@metamask/phishing-controller@^10.1.1":
+ version "10.1.1"
+ resolved "https://registry.yarnpkg.com/@metamask/phishing-controller/-/phishing-controller-10.1.1.tgz#3db238f2babd34e1b206122a12a8a09fa62c71a4"
+ integrity sha512-MDLzeCui5uhsY0nkJpdOtSyxq5zIyFfD2QsZG95QXHGyF1/xr3T6zljGQqdg7dCD2qZ4OWohLG5GbZK5K0nr8Q==
+ dependencies:
+ "@metamask/base-controller" "^6.0.2"
+ "@metamask/controller-utils" "^11.0.2"
+ "@types/punycode" "^2.1.0"
+ eth-phishing-detect "^1.2.0"
+ fastest-levenshtein "^1.0.16"
+ punycode "^2.1.1"
+
+"@metamask/phishing-controller@^12.0.3":
version "12.0.3"
resolved "https://registry.yarnpkg.com/@metamask/phishing-controller/-/phishing-controller-12.0.3.tgz#f1a5a2046e4c7a04613b4c41bc19771cf8235db7"
integrity sha512-CR1qN2FkMJp+MyNSXVTvrZY7MjCdkvsofW/kyv6oshPtLV6BGBWFyueS2UgjMNsmQDW/vMXUJMZfcMS6rs3S4w==
@@ -5156,6 +4874,17 @@
fastest-levenshtein "^1.0.16"
punycode "^2.1.1"
+"@metamask/phishing-controller@^9.0.1":
+ version "9.0.2"
+ resolved "https://registry.yarnpkg.com/@metamask/phishing-controller/-/phishing-controller-9.0.2.tgz#d140b6a8a05947c59b04bf161a0d9055e6b711b2"
+ integrity sha512-eZRbym8o7isHbu741GVztxD2rzKvNQvB+XbmAq6qJD6eMKSSYKC9r/nDaxzaVz9qO93XCE8WnvSUmJx4m8RtaA==
+ dependencies:
+ "@metamask/base-controller" "^5.0.2"
+ "@metamask/controller-utils" "^9.1.0"
+ "@types/punycode" "^2.1.0"
+ eth-phishing-detect "^1.2.0"
+ punycode "^2.1.1"
+
"@metamask/polling-controller@^4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@metamask/polling-controller/-/polling-controller-4.0.0.tgz#20ab8195cbf388ecc9c03f64234557ae8a528d37"
@@ -5208,12 +4937,12 @@
fast-json-stable-stringify "^2.1.0"
uuid "^8.3.2"
-"@metamask/post-message-stream@^8.0.0", "@metamask/post-message-stream@^8.1.1":
- version "8.1.1"
- resolved "https://registry.yarnpkg.com/@metamask/post-message-stream/-/post-message-stream-8.1.1.tgz#fd8f4c2363921aaf15c0fa56d087fa9f2d93f047"
- integrity sha512-Z5LHqE8MI0g9xKT7dOr4G11Qjf2bWg9rFonpFnUJwxJvfIl6KuGVnfOTo7PVXH3zdlWotlhhC2F65QW9WxVSPQ==
+"@metamask/post-message-stream@^8.0.0", "@metamask/post-message-stream@^8.1.0":
+ version "8.1.0"
+ resolved "https://registry.yarnpkg.com/@metamask/post-message-stream/-/post-message-stream-8.1.0.tgz#1139c6411b127b14a7fda43a95d1d33f4affef02"
+ integrity sha512-3qnep25SRFLg51wZCez1AqwL/ahJdjyOkAs8Wk0zZHUuTHZ4h0ZtehidX904cHx4QM3STWA1pTRI7ygtkzkN0Q==
dependencies:
- "@metamask/utils" "^9.0.0"
+ "@metamask/utils" "^8.1.0"
readable-stream "3.6.2"
"@metamask/ppom-validator@0.32.0":
@@ -5239,14 +4968,14 @@
"@metamask/base-controller" "^5.0.2"
"@metamask/controller-utils" "^9.1.0"
-"@metamask/profile-sync-controller@^0.8.1":
- version "0.8.1"
- resolved "https://registry.yarnpkg.com/@metamask/profile-sync-controller/-/profile-sync-controller-0.8.1.tgz#f2c5c89710286ad885756fe887405edb51fd3d81"
- integrity sha512-kD9NxAJxly1ngD8RE6wK+hGIDhoHwYG5RBqP3rRAdtr2pOVlCFAbNVFZjfjFyEK8fpOw+5qwhR3h0yKzjVrzaw==
+"@metamask/profile-sync-controller@^0.2.1":
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/@metamask/profile-sync-controller/-/profile-sync-controller-0.2.1.tgz#b9e4d951ba357c7b26dd4ad68049635f1b6947e1"
+ integrity sha512-F4domapXsNmN2LmEUzOGTWPoTmlorlebCnh8LW6JxbIQuqgyi+sKpfE0zb2M60Z8AYR6v+qnjw7X47CS9HHupQ==
dependencies:
- "@metamask/base-controller" "^7.0.1"
- "@metamask/snaps-sdk" "^6.5.0"
- "@metamask/snaps-utils" "^8.1.1"
+ "@metamask/base-controller" "^6.0.2"
+ "@metamask/snaps-sdk" "^6.1.1"
+ "@metamask/snaps-utils" "^7.8.1"
"@noble/ciphers" "^0.5.2"
"@noble/hashes" "^1.4.0"
immer "^9.0.6"
@@ -5388,15 +5117,19 @@
"@metamask/swappable-obj-proxy" "^2.2.0"
"@metamask/utils" "^8.3.0"
-"@metamask/signature-controller@^19.1.0":
- version "19.1.0"
- resolved "https://registry.yarnpkg.com/@metamask/signature-controller/-/signature-controller-19.1.0.tgz#47c7435f51d3273fb5a0373f4ebdcfccb6d490a9"
- integrity sha512-1rDKxV7HYoKZjBbqkeWLk3TLJJcl8cRgAkPTG8jMRIp7eYW2vUxo5nsiaJlBBHDV/fbjR12SbiawMjj93zD2DA==
+"@metamask/signature-controller@^17.0.0":
+ version "17.0.0"
+ resolved "https://registry.yarnpkg.com/@metamask/signature-controller/-/signature-controller-17.0.0.tgz#4600d36a05a818aef07277c3720afb4088aa68d2"
+ integrity sha512-DW3toA44FtcawY1L6UxK67dpZ7i1tOnJnsZ7igYlwBvTZ5BUQu1RET9wSB+f86NJZNluwR4Os4Y6lABwyXTiUQ==
dependencies:
- "@metamask/base-controller" "^7.0.1"
- "@metamask/controller-utils" "^11.3.0"
- "@metamask/message-manager" "^10.1.1"
- "@metamask/utils" "^9.1.0"
+ "@metamask/approval-controller" "^6.0.2"
+ "@metamask/base-controller" "^5.0.2"
+ "@metamask/controller-utils" "^10.0.0"
+ "@metamask/keyring-controller" "^16.1.0"
+ "@metamask/logging-controller" "^4.0.0"
+ "@metamask/message-manager" "^9.0.0"
+ "@metamask/rpc-errors" "^6.2.1"
+ "@metamask/utils" "^8.3.0"
lodash "^4.17.21"
"@metamask/slip44@3.1.0", "@metamask/slip44@^3.1.0":
@@ -5409,10 +5142,10 @@
resolved "https://registry.yarnpkg.com/@metamask/slip44/-/slip44-4.0.0.tgz#690a52d2ba74ea677d9bd0e827a90c8809fbecd3"
integrity sha512-MQMocMvFmp1MWownjKMuxevivwYeNQPSpNyIg9K7nmxKuoatp5NUc9L8EJ3Bh//rOfl6fBfXn9byfS0t+NE02Q==
-"@metamask/smart-transactions-controller@^13.0.0":
- version "13.0.0"
- resolved "https://registry.yarnpkg.com/@metamask/smart-transactions-controller/-/smart-transactions-controller-13.0.0.tgz#4a1f47cc5831598edc1bffb00ff74dbda6a3499e"
- integrity sha512-7tNtCBXmkWnjHRHVskd2NuJnn+nAZQ3r0oX8QOcc4yINzTk+rBTPEMbPyCmlGP8md53t2EeTuM80iLO61BTGug==
+"@metamask/smart-transactions-controller@11.0.0":
+ version "11.0.0"
+ resolved "https://registry.yarnpkg.com/@metamask/smart-transactions-controller/-/smart-transactions-controller-11.0.0.tgz#79c9d52bb3fc6c3fdc4c470c92f1a287111353f0"
+ integrity sha512-CNOB737ibWTMSI2/UMqszlP3qsrZNW5uOtWGgnA1t3upuxgJ63R1BJ8lQl5hGLx7R2VyehvRh7K0tXsPLcQGEg==
dependencies:
"@babel/runtime" "^7.24.1"
"@ethereumjs/tx" "^5.2.1"
@@ -5422,7 +5155,7 @@
"@metamask/controller-utils" "^11.0.0"
"@metamask/eth-json-rpc-provider" "^4.1.0"
"@metamask/eth-query" "^4.0.0"
- "@metamask/network-controller" "^20.0.0"
+ "@metamask/network-controller" "^19.0.0"
"@metamask/polling-controller" "^8.0.0"
"@metamask/transaction-controller" "^34.0.0"
bignumber.js "^9.0.1"
@@ -5430,10 +5163,40 @@
fast-json-patch "^3.1.0"
lodash "^4.17.21"
-"@metamask/snaps-controllers@^9.6.0", "@metamask/snaps-controllers@^9.8.0":
- version "9.8.0"
- resolved "https://registry.yarnpkg.com/@metamask/snaps-controllers/-/snaps-controllers-9.8.0.tgz#576de64fcaec7d393cc5c39f7d94dec068f3e2bf"
- integrity sha512-Ey5bHhCsODF7NIkFvr3773ZYrxhbErLE1M12AUBIiLo7p5h/h8nWY+ilObQjTj3Au58oQ5QNYK1juvHMogFgdA==
+"@metamask/snaps-controllers@^8.1.1":
+ version "8.3.1"
+ resolved "https://registry.yarnpkg.com/@metamask/snaps-controllers/-/snaps-controllers-8.3.1.tgz#a509a020aa4a2eac88ecc6ec84c6bc488282f143"
+ integrity sha512-kGyywksj7VyEuQXRKdFZBSAcTYPjr22J21FLhIBiiSlBI3lbHEqb/hr/q8b+m27iA1JGtTrvJL1JMpRFGQAOEA==
+ dependencies:
+ "@metamask/approval-controller" "^6.0.2"
+ "@metamask/base-controller" "^5.0.2"
+ "@metamask/json-rpc-engine" "^8.0.1"
+ "@metamask/json-rpc-middleware-stream" "^7.0.1"
+ "@metamask/object-multiplex" "^2.0.0"
+ "@metamask/permission-controller" "^9.0.2"
+ "@metamask/phishing-controller" "^9.0.1"
+ "@metamask/post-message-stream" "^8.1.0"
+ "@metamask/rpc-errors" "^6.2.1"
+ "@metamask/snaps-registry" "^3.1.0"
+ "@metamask/snaps-rpc-methods" "^9.1.2"
+ "@metamask/snaps-sdk" "^4.4.1"
+ "@metamask/snaps-utils" "^7.4.1"
+ "@metamask/utils" "^8.3.0"
+ "@xstate/fsm" "^2.0.0"
+ browserify-zlib "^0.2.0"
+ concat-stream "^2.0.0"
+ fast-deep-equal "^3.1.3"
+ get-npm-tarball-url "^2.0.3"
+ immer "^9.0.6"
+ nanoid "^3.1.31"
+ readable-stream "^3.6.2"
+ readable-web-to-node-stream "^3.0.2"
+ tar-stream "^3.1.7"
+
+"@metamask/snaps-controllers@^9.4.0":
+ version "9.4.0"
+ resolved "https://registry.yarnpkg.com/@metamask/snaps-controllers/-/snaps-controllers-9.4.0.tgz#5038d34b0ca1d90b91c784ee260aa4cd176d2b07"
+ integrity sha512-Lqwxu5ag5mh6clgPn+5CEo6zRnFTcy0qn8j8IBYgyNFv1jx5vvw1eLvNrUySDkUconV3q80Qsi9QhZqFnXRBRg==
dependencies:
"@metamask/approval-controller" "^7.0.2"
"@metamask/base-controller" "^6.0.2"
@@ -5441,14 +5204,14 @@
"@metamask/json-rpc-middleware-stream" "^8.0.2"
"@metamask/object-multiplex" "^2.0.0"
"@metamask/permission-controller" "^11.0.0"
- "@metamask/phishing-controller" "^12.0.2"
- "@metamask/post-message-stream" "^8.1.1"
+ "@metamask/phishing-controller" "^10.1.1"
+ "@metamask/post-message-stream" "^8.1.0"
"@metamask/rpc-errors" "^6.3.1"
"@metamask/snaps-registry" "^3.2.1"
- "@metamask/snaps-rpc-methods" "^11.1.1"
- "@metamask/snaps-sdk" "^6.5.1"
- "@metamask/snaps-utils" "^8.1.1"
- "@metamask/utils" "^9.2.1"
+ "@metamask/snaps-rpc-methods" "^11.0.0"
+ "@metamask/snaps-sdk" "^6.2.0"
+ "@metamask/snaps-utils" "^8.0.0"
+ "@metamask/utils" "^9.1.0"
"@xstate/fsm" "^2.0.0"
browserify-zlib "^0.2.0"
concat-stream "^2.0.0"
@@ -5460,24 +5223,24 @@
readable-web-to-node-stream "^3.0.2"
tar-stream "^3.1.7"
-"@metamask/snaps-execution-environments@^6.7.2":
- version "6.7.2"
- resolved "https://registry.yarnpkg.com/@metamask/snaps-execution-environments/-/snaps-execution-environments-6.7.2.tgz#d541006ce5a7acfc954a24acfed7d052ffef0f1d"
- integrity sha512-MY2GVXAc6X1hZdnTtrHvLgHrCr/zdUv1FGO5JuJi04n7gQUMX0gx5r/g4BoCbgYZFJGYBXCLFByIhhLTawRgGA==
+"@metamask/snaps-execution-environments@^6.6.2":
+ version "6.6.2"
+ resolved "https://registry.yarnpkg.com/@metamask/snaps-execution-environments/-/snaps-execution-environments-6.6.2.tgz#bfc50fbcc861d6f73ec09956b6e2cee90e25b5e3"
+ integrity sha512-NThhlP/kw2C3gM5y9vxVqekPos9Nfy3Rv9RyDO3jDTYBRZJrWEW+DIlgKbsa0dz9nAJ3uzDLsg/AdLcKuQgkUQ==
dependencies:
"@metamask/json-rpc-engine" "^9.0.2"
"@metamask/object-multiplex" "^2.0.0"
- "@metamask/post-message-stream" "^8.1.1"
+ "@metamask/post-message-stream" "^8.1.0"
"@metamask/providers" "^17.1.2"
"@metamask/rpc-errors" "^6.3.1"
- "@metamask/snaps-sdk" "^6.5.0"
- "@metamask/snaps-utils" "^8.1.1"
+ "@metamask/snaps-sdk" "^6.1.0"
+ "@metamask/snaps-utils" "^7.8.1"
"@metamask/superstruct" "^3.1.0"
- "@metamask/utils" "^9.2.1"
+ "@metamask/utils" "^9.1.0"
nanoid "^3.1.31"
readable-stream "^3.6.2"
-"@metamask/snaps-registry@^3.2.1":
+"@metamask/snaps-registry@^3.1.0", "@metamask/snaps-registry@^3.2.1":
version "3.2.1"
resolved "https://registry.yarnpkg.com/@metamask/snaps-registry/-/snaps-registry-3.2.1.tgz#ff97329b97e8dc9a512f0c5f0f41b3554a592ad3"
integrity sha512-MnG1BBJk4UK9iJArK+h/iz8wlt+xjsvgnj0k39p5658hWZu6cuumHoV1EIupCwsCv7XXOBLc8iAgjvITXKC1FQ==
@@ -5487,21 +5250,21 @@
"@noble/curves" "^1.2.0"
"@noble/hashes" "^1.3.2"
-"@metamask/snaps-rpc-methods@^11.1.1":
- version "11.1.1"
- resolved "https://registry.yarnpkg.com/@metamask/snaps-rpc-methods/-/snaps-rpc-methods-11.1.1.tgz#d01a82cb1d8af60ade5f3d3da3adf8a275beda48"
- integrity sha512-j4oJyMSBLTLg0RA28wgsCjdbC/YZUyRB/U6/tLCsaGXDKIPnOR17yjyeOx/IKLQR91ZC2+y4dMkgFbyOVSDI3Q==
+"@metamask/snaps-rpc-methods@^11.0.0":
+ version "11.0.0"
+ resolved "https://registry.yarnpkg.com/@metamask/snaps-rpc-methods/-/snaps-rpc-methods-11.0.0.tgz#eefabb1de50c0cdb2a8ed35b106298c8d4b064d4"
+ integrity sha512-M2T+BHGdEunCXZESX3x6aYl4A4BjTtXn2cW3Z5UVhJORpqgGqvBxCgvohbol0y2oCoqaOe/elDy9N8xap8pJpQ==
dependencies:
"@metamask/key-tree" "^9.1.2"
"@metamask/permission-controller" "^11.0.0"
"@metamask/rpc-errors" "^6.3.1"
- "@metamask/snaps-sdk" "^6.5.0"
- "@metamask/snaps-utils" "^8.1.1"
+ "@metamask/snaps-sdk" "^6.2.0"
+ "@metamask/snaps-utils" "^8.0.0"
"@metamask/superstruct" "^3.1.0"
- "@metamask/utils" "^9.2.1"
+ "@metamask/utils" "^9.1.0"
"@noble/hashes" "^1.3.1"
-"@metamask/snaps-rpc-methods@^9.1.4":
+"@metamask/snaps-rpc-methods@^9.1.2", "@metamask/snaps-rpc-methods@^9.1.4":
version "9.1.4"
resolved "https://registry.yarnpkg.com/@metamask/snaps-rpc-methods/-/snaps-rpc-methods-9.1.4.tgz#d0aa695b89326eece7b23d188d8dce7d35a78d9c"
integrity sha512-eYcfJDYlXE4RqtRTyp8n7SsJ0aAQlz5H335/5jch3L3CwQwC3z8KlKm258iXPiyT7fa9VVxdZqGs/rBaivx0Iw==
@@ -5527,10 +5290,10 @@
fast-xml-parser "^4.3.4"
superstruct "^1.0.3"
-"@metamask/snaps-sdk@^4.2.0":
- version "4.4.2"
- resolved "https://registry.yarnpkg.com/@metamask/snaps-sdk/-/snaps-sdk-4.4.2.tgz#6d7654ca3ecbcda5cd8689f49721c084241a4495"
- integrity sha512-V6d1kQdkCTYQ7Z3+ZVnMWjwsS2TRaKNnSRtSHgjATdSacW5d/1td2KbTs+1x1/cSe58ULKW1SBwRNy0i0c95hA==
+"@metamask/snaps-sdk@^4.2.0", "@metamask/snaps-sdk@^4.4.1":
+ version "4.4.1"
+ resolved "https://registry.yarnpkg.com/@metamask/snaps-sdk/-/snaps-sdk-4.4.1.tgz#90603a6c83eeb27334e7192a77e7abd6a01d1f53"
+ integrity sha512-SNtkyIOYdaadFKPSpnGfNu7dXHiTXogHusQdmIHkqidWQaFTIEnKuViePTPgBCdx17/nwu/ZBEhq0AlugRsZ6w==
dependencies:
"@metamask/key-tree" "^9.1.1"
"@metamask/providers" "^17.0.0"
@@ -5539,18 +5302,18 @@
fast-xml-parser "^4.3.4"
superstruct "^1.0.3"
-"@metamask/snaps-sdk@^6.0.0", "@metamask/snaps-sdk@^6.1.0", "@metamask/snaps-sdk@^6.4.0", "@metamask/snaps-sdk@^6.5.0", "@metamask/snaps-sdk@^6.5.1":
- version "6.5.1"
- resolved "https://registry.yarnpkg.com/@metamask/snaps-sdk/-/snaps-sdk-6.5.1.tgz#527691767d98c08c802656b020d5d94d6336623e"
- integrity sha512-uQEZZNjKwHZZfu9StwlmvTFle5MqiheO6AQctVhpYGJ1kjJ7Qwa+vJhMd0Ox1QI9C3qaUCqxOCDV0mpd1jPRKg==
+"@metamask/snaps-sdk@^6.0.0", "@metamask/snaps-sdk@^6.1.0", "@metamask/snaps-sdk@^6.1.1", "@metamask/snaps-sdk@^6.2.0", "@metamask/snaps-sdk@^6.2.1":
+ version "6.2.1"
+ resolved "https://registry.yarnpkg.com/@metamask/snaps-sdk/-/snaps-sdk-6.2.1.tgz#6bb59133326d36786d5ca14de136da577fae1c83"
+ integrity sha512-apjtC9o+XLjShKntIbiHD+XIuQIGAa/+uIRkzKa2Lm3ADNi04VtkPl8VBfDiY4MSIArjQgj9EIk+rK6aW8H5oA==
dependencies:
"@metamask/key-tree" "^9.1.2"
"@metamask/providers" "^17.1.2"
"@metamask/rpc-errors" "^6.3.1"
"@metamask/superstruct" "^3.1.0"
- "@metamask/utils" "^9.2.1"
+ "@metamask/utils" "^9.1.0"
-"@metamask/snaps-utils@^7.7.0", "@metamask/snaps-utils@^7.8.0":
+"@metamask/snaps-utils@^7.4.0", "@metamask/snaps-utils@^7.4.1", "@metamask/snaps-utils@^7.7.0", "@metamask/snaps-utils@^7.8.1":
version "7.8.1"
resolved "https://registry.yarnpkg.com/@metamask/snaps-utils/-/snaps-utils-7.8.1.tgz#d18f56ece8a1d4e9ff2e8e7645c3349cf08937bc"
integrity sha512-v0xNoiWeJGHvtJqP0aU5dj+phqpV6vKCJoV5tNBXl8/AvMTaV2YL4SLO/z+PTo0RWZFplgAuuDsY254kAXi9Fw==
@@ -5579,10 +5342,10 @@
ses "^1.1.0"
validate-npm-package-name "^5.0.0"
-"@metamask/snaps-utils@^8.1.1":
- version "8.1.1"
- resolved "https://registry.yarnpkg.com/@metamask/snaps-utils/-/snaps-utils-8.1.1.tgz#b32c403c0b5419dae3a22e4c6119099e9b3466ba"
- integrity sha512-oKwm+0r2WIFinMo07RYAQVb2Khr/T+c8+V0m4iT9WfJHVNG8mHUMonH3ae2jksZ0/327na0mYVj804PLQ88SNA==
+"@metamask/snaps-utils@^8.0.0", "@metamask/snaps-utils@^8.0.1":
+ version "8.0.1"
+ resolved "https://registry.yarnpkg.com/@metamask/snaps-utils/-/snaps-utils-8.0.1.tgz#4a86d1ba54ce47295913658a64a2ea81516f8521"
+ integrity sha512-yS2bPi0Tlsj/uUbIKhb/SVhtF9jmCbiCe5uX42GCnkYK4klNHmDkVGwMit+gqEuNzeTmKO4PwbhxnoL4QZZU/A==
dependencies:
"@babel/core" "^7.23.2"
"@babel/types" "^7.23.0"
@@ -5592,9 +5355,9 @@
"@metamask/rpc-errors" "^6.3.1"
"@metamask/slip44" "^4.0.0"
"@metamask/snaps-registry" "^3.2.1"
- "@metamask/snaps-sdk" "^6.5.0"
+ "@metamask/snaps-sdk" "^6.2.1"
"@metamask/superstruct" "^3.1.0"
- "@metamask/utils" "^9.2.1"
+ "@metamask/utils" "^9.1.0"
"@noble/hashes" "^1.3.1"
"@scure/base" "^1.1.1"
chalk "^4.1.2"
@@ -5710,7 +5473,7 @@
semver "^7.3.8"
superstruct "^1.0.3"
-"@metamask/utils@^8.1.0", "@metamask/utils@^8.2.0", "@metamask/utils@^8.3.0", "@metamask/utils@^8.4.0":
+"@metamask/utils@^8.0.0", "@metamask/utils@^8.1.0", "@metamask/utils@^8.2.0", "@metamask/utils@^8.3.0", "@metamask/utils@^8.4.0":
version "8.4.0"
resolved "https://registry.yarnpkg.com/@metamask/utils/-/utils-8.4.0.tgz#f44812c96467a4e1b70b2edff6ee89a9caa4e354"
integrity sha512-dbIc3C7alOe0agCuBHM1h71UaEaEqOk2W8rAtEn8QGz4haH2Qq7MoK6i7v2guzvkJVVh79c+QCzIqphC3KvrJg==
@@ -5725,10 +5488,10 @@
superstruct "^1.0.3"
uuid "^9.0.1"
-"@metamask/utils@^9.0.0", "@metamask/utils@^9.1.0", "@metamask/utils@^9.2.1":
- version "9.2.1"
- resolved "https://registry.yarnpkg.com/@metamask/utils/-/utils-9.2.1.tgz#d9f84706ff97e0c8d1bde5778549365b14269e81"
- integrity sha512-/u663aUaB6+Xe75i3Mt/1cCljm41HDYIsna5oBrwGvgkY2zH7/9k9Zjd706cxoAbxN7QgLSVAReUiGnuxCuXrQ==
+"@metamask/utils@^9.0.0", "@metamask/utils@^9.1.0":
+ version "9.1.0"
+ resolved "https://registry.yarnpkg.com/@metamask/utils/-/utils-9.1.0.tgz#54e5afcec07e6032d4dd4171e862b36daa52d77e"
+ integrity sha512-g2REf+xSt0OZfMoNNdC4+/Yy8eP3KUqvIArel54XRFKPoXbHI6+YjFfrLtfykWBjffOp7DTfIc3Kvk5TLfuiyg==
dependencies:
"@ethereumjs/tx" "^4.2.0"
"@metamask/superstruct" "^3.1.0"
@@ -5832,10 +5595,10 @@
"@nodelib/fs.scandir" "2.1.5"
fastq "^1.6.0"
-"@notifee/react-native@^9.0.0":
- version "9.0.2"
- resolved "https://registry.yarnpkg.com/@notifee/react-native/-/react-native-9.0.2.tgz#28e2b11afa10b13717518d2fd6377b45a754bbba"
- integrity sha512-fuStKItKNg+X8ke8qkFC/NjAFuI4Gvt0J8r8LbuXYHyPUj+YiauQSEyVKejQp+a98UyJrAJtKrgJ7XDru+vNiA==
+"@notifee/react-native@^7.8.2":
+ version "7.8.2"
+ resolved "https://registry.yarnpkg.com/@notifee/react-native/-/react-native-7.8.2.tgz#72d3199ae830b4128ddaef3c1c2f11604759c9c4"
+ integrity sha512-VG4IkWJIlOKqXwa3aExC3WFCVCGCC9BA55Ivg0SMRfEs+ruvYy/zlLANcrVGiPtgkUEryXDhA8SXx9+JcO8oLA==
"@npmcli/agent@^2.0.0":
version "2.2.2"
@@ -5905,11 +5668,29 @@
node-gyp "^10.0.0"
which "^4.0.0"
+"@octokit/auth-token@^4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-4.0.0.tgz#40d203ea827b9f17f42a29c6afb93b7745ef80c7"
+ integrity sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==
+
"@octokit/auth-token@^5.0.0":
version "5.1.1"
resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-5.1.1.tgz#3bbfe905111332a17f72d80bd0b51a3e2fa2cf07"
integrity sha512-rh3G3wDO8J9wSjfI436JUKzHIxq8NaiL0tVeB2aXmG6p/9859aUOAjA9pmSPNGGZxfwmaJ9ozOJImuNVJdpvbA==
+"@octokit/core@^5.0.1":
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/@octokit/core/-/core-5.2.0.tgz#ddbeaefc6b44a39834e1bb2e58a49a117672a7ea"
+ integrity sha512-1LFfa/qnMQvEOAdzlQymH0ulepxbxnCYAKJZfMci/5XJyIHWgEYnDmgnKakbTh7CH2tFQ5O60oYDvns4i9RAIg==
+ dependencies:
+ "@octokit/auth-token" "^4.0.0"
+ "@octokit/graphql" "^7.1.0"
+ "@octokit/request" "^8.3.1"
+ "@octokit/request-error" "^5.1.0"
+ "@octokit/types" "^13.0.0"
+ before-after-hook "^2.2.0"
+ universal-user-agent "^6.0.0"
+
"@octokit/core@^6.1.2":
version "6.1.2"
resolved "https://registry.yarnpkg.com/@octokit/core/-/core-6.1.2.tgz#20442d0a97c411612da206411e356014d1d1bd17"
@@ -5931,6 +5712,23 @@
"@octokit/types" "^13.0.0"
universal-user-agent "^7.0.2"
+"@octokit/endpoint@^9.0.1":
+ version "9.0.5"
+ resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-9.0.5.tgz#e6c0ee684e307614c02fc6ac12274c50da465c44"
+ integrity sha512-ekqR4/+PCLkEBF6qgj8WqJfvDq65RH85OAgrtnVp1mSxaXF03u2xW/hUdweGS5654IlC0wkNYC18Z50tSYTAFw==
+ dependencies:
+ "@octokit/types" "^13.1.0"
+ universal-user-agent "^6.0.0"
+
+"@octokit/graphql@^7.1.0":
+ version "7.1.0"
+ resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-7.1.0.tgz#9bc1c5de92f026648131f04101cab949eeffe4e0"
+ integrity sha512-r+oZUH7aMFui1ypZnAvZmn0KSqAUgE1/tUXIWaqUCa1758ts/Jio84GZuzsvUkme98kv0WFY8//n0J1Z+vsIsQ==
+ dependencies:
+ "@octokit/request" "^8.3.0"
+ "@octokit/types" "^13.0.0"
+ universal-user-agent "^6.0.0"
+
"@octokit/graphql@^8.0.0":
version "8.1.1"
resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-8.1.1.tgz#3cacab5f2e55d91c733e3bf481d3a3f8a5f639c4"
@@ -5940,6 +5738,11 @@
"@octokit/types" "^13.0.0"
universal-user-agent "^7.0.0"
+"@octokit/openapi-types@^20.0.0":
+ version "20.0.0"
+ resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-20.0.0.tgz#9ec2daa0090eeb865ee147636e0c00f73790c6e5"
+ integrity sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==
+
"@octokit/openapi-types@^22.2.0":
version "22.2.0"
resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-22.2.0.tgz#75aa7dcd440821d99def6a60b5f014207ae4968e"
@@ -5952,11 +5755,25 @@
dependencies:
"@octokit/types" "^13.5.0"
+"@octokit/plugin-paginate-rest@^9.0.0":
+ version "9.2.1"
+ resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.2.1.tgz#2e2a2f0f52c9a4b1da1a3aa17dabe3c459b9e401"
+ integrity sha512-wfGhE/TAkXZRLjksFXuDZdmGnJQHvtU/joFQdweXUgzo1XwvBCD4o4+75NtFfjfLK5IwLf9vHTfSiU3sLRYpRw==
+ dependencies:
+ "@octokit/types" "^12.6.0"
+
"@octokit/plugin-request-log@^5.1.0":
version "5.3.0"
resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-5.3.0.tgz#4dea4f34316b7075d02796edcb73103266119e61"
integrity sha512-FiGcyjdtYPlr03ExBk/0ysIlEFIFGJQAVoPPMxL19B24bVSEiZQnVGBunNtaAF1YnvE/EFoDpXmITtRnyCiypQ==
+"@octokit/plugin-rest-endpoint-methods@^10.0.0":
+ version "10.4.1"
+ resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-10.4.1.tgz#41ba478a558b9f554793075b2e20cd2ef973be17"
+ integrity sha512-xV1b+ceKV9KytQe3zCVqjg+8GTGfDYwaT1ATU5isiUyVtlVAO3HNdzpS4sr4GBx4hxQ46s7ITtZrAsxG22+rVg==
+ dependencies:
+ "@octokit/types" "^12.6.0"
+
"@octokit/plugin-rest-endpoint-methods@^13.0.0":
version "13.2.1"
resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-13.2.1.tgz#b5e9118b4e76180cee65e03b71bcfcf632ae12d9"
@@ -5964,6 +5781,15 @@
dependencies:
"@octokit/types" "^13.5.0"
+"@octokit/request-error@^5.1.0":
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-5.1.0.tgz#ee4138538d08c81a60be3f320cd71063064a3b30"
+ integrity sha512-GETXfE05J0+7H2STzekpKObFe765O5dlAKUTLNGeH+x47z7JjXHfsHKo5z21D/o/IOZTUEI6nyWyR+bZVP/n5Q==
+ dependencies:
+ "@octokit/types" "^13.1.0"
+ deprecation "^2.0.0"
+ once "^1.4.0"
+
"@octokit/request-error@^6.0.1":
version "6.1.1"
resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-6.1.1.tgz#bed1b5f52ce7fefb1077a92bf42124ff36f73f2c"
@@ -5971,6 +5797,16 @@
dependencies:
"@octokit/types" "^13.0.0"
+"@octokit/request@^8.3.0", "@octokit/request@^8.3.1":
+ version "8.4.0"
+ resolved "https://registry.yarnpkg.com/@octokit/request/-/request-8.4.0.tgz#7f4b7b1daa3d1f48c0977ad8fffa2c18adef8974"
+ integrity sha512-9Bb014e+m2TgBeEJGEbdplMVWwPmL1FPtggHQRkV+WVsMggPtEkLKPlcVYm/o8xKLkpJ7B+6N8WfQMtDLX2Dpw==
+ dependencies:
+ "@octokit/endpoint" "^9.0.1"
+ "@octokit/request-error" "^5.1.0"
+ "@octokit/types" "^13.1.0"
+ universal-user-agent "^6.0.0"
+
"@octokit/request@^9.0.0":
version "9.1.1"
resolved "https://registry.yarnpkg.com/@octokit/request/-/request-9.1.1.tgz#e836eb69c0fb4b59b6437af7716ca348a1232a52"
@@ -5991,6 +5827,13 @@
"@octokit/plugin-request-log" "^5.1.0"
"@octokit/plugin-rest-endpoint-methods" "^13.0.0"
+"@octokit/types@^12.6.0":
+ version "12.6.0"
+ resolved "https://registry.yarnpkg.com/@octokit/types/-/types-12.6.0.tgz#8100fb9eeedfe083aae66473bd97b15b62aedcb2"
+ integrity sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==
+ dependencies:
+ "@octokit/openapi-types" "^20.0.0"
+
"@octokit/types@^13.0.0", "@octokit/types@^13.1.0", "@octokit/types@^13.5.0":
version "13.5.0"
resolved "https://registry.yarnpkg.com/@octokit/types/-/types-13.5.0.tgz#4796e56b7b267ebc7c921dcec262b3d5bfb18883"
@@ -6798,18 +6641,18 @@
dependencies:
invariant "^2.2.4"
-"@react-native-firebase/app@^20.5.0":
- version "20.5.0"
- resolved "https://registry.yarnpkg.com/@react-native-firebase/app/-/app-20.5.0.tgz#9dc2fbc6eee7fb00eefc9f88e404411068befd29"
- integrity sha512-zW6jc9R8Ikxxo5qXv25No6QxdWOx37D4U0ppKZQoY6CzwGUzqc4oQUU9MclbUcx+H5p+GEzvT1EIGV6JG7/FAg==
+"@react-native-firebase/app@^20.1.0":
+ version "20.1.0"
+ resolved "https://registry.yarnpkg.com/@react-native-firebase/app/-/app-20.1.0.tgz#86b9371290f92d51821b7299eede95336949f214"
+ integrity sha512-FCcTtmfz/Bk2laOEKOiUrQUkAnzerkRml7d3kZzJSxaBWLFxpWJQnnXqGZmD8hNWio2QEauB8llUD71KiDk+sw==
dependencies:
- firebase "10.12.2"
+ opencollective-postinstall "^2.0.3"
superstruct "^0.6.2"
-"@react-native-firebase/messaging@^20.5.0":
- version "20.5.0"
- resolved "https://registry.yarnpkg.com/@react-native-firebase/messaging/-/messaging-20.5.0.tgz#90eeed62d1a069b4fd56746afcfb33ee2a61ba0f"
- integrity sha512-S3M9zHJ3zKRH6PuxxjOrV9i0uRO3S5rGYaY3s64BTh4iLEG46UDgJ5uA+WsY+9IsJtSpN4HYDcvnwoxasiEUfw==
+"@react-native-firebase/messaging@^20.1.0":
+ version "20.1.0"
+ resolved "https://registry.yarnpkg.com/@react-native-firebase/messaging/-/messaging-20.1.0.tgz#02026259c74d1725dfc5216158b05bc6655e7951"
+ integrity sha512-y9FtQ9dIQSyueuLeJghvfLYnay5BqPVgl9T94p+HtUlkxinOgNDjquQFtV/QlzVOyVpLrVPmknMohvBj/fvBzg==
"@react-native-masked-view/masked-view@^0.3.1":
version "0.3.1"
@@ -9421,11 +9264,26 @@
resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
-"@tsconfig/node14@1.0.3":
+"@tsconfig/node10@^1.0.7":
+ version "1.0.9"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
+ integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
+
+"@tsconfig/node12@^1.0.7":
+ version "1.0.11"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
+ integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
+
+"@tsconfig/node14@1.0.3", "@tsconfig/node14@^1.0.0":
version "1.0.3"
resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
+"@tsconfig/node16@^1.0.2":
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
+ integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
+
"@types/archiver@5.3.2":
version "5.3.2"
resolved "https://registry.yarnpkg.com/@types/archiver/-/archiver-5.3.2.tgz#a9f0bcb0f0b991400e7766d35f6e19d163bdadcc"
@@ -11580,7 +11438,12 @@ acorn-jsx@^5.3.2:
resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
-acorn@^8.10.0, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0:
+acorn-walk@^8.1.1:
+ version "8.2.0"
+ resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
+ integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
+
+acorn@^8.10.0, acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0:
version "8.12.1"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
@@ -12580,6 +12443,11 @@ are-we-there-yet@~1.1.2:
delegates "^1.0.0"
readable-stream "^2.0.6"
+arg@^4.1.0:
+ version "4.1.3"
+ resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
+ integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
+
argparse@^1.0.7:
version "1.0.10"
resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -13321,6 +13189,11 @@ bech32@^2.0.0:
resolved "https://registry.yarnpkg.com/bech32/-/bech32-2.0.0.tgz#078d3686535075c8c79709f054b1b226a133b355"
integrity sha512-LcknSilhIGatDAsY1ak2I8VtGaHNhgMSYVxFrGLXv+xLHytaKZKcaUJJUE7qmBr7h33o5YQwP55pMI0xmkpJwg==
+before-after-hook@^2.2.0:
+ version "2.2.3"
+ resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.3.tgz#c51e809c81a4e354084422b9b26bad88249c517c"
+ integrity sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==
+
before-after-hook@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-3.0.2.tgz#d5665a5fa8b62294a5aa0a499f933f4a1016195d"
@@ -13692,7 +13565,7 @@ buffer@^4.9.1:
ieee754 "^1.1.4"
isarray "^1.0.0"
-buffer@^5.0.8, buffer@^5.1.0, buffer@^5.2.0, buffer@^5.2.1, buffer@^5.4.3, buffer@^5.5.0, buffer@^5.6.0:
+buffer@^5.1.0, buffer@^5.2.0, buffer@^5.2.1, buffer@^5.4.3, buffer@^5.5.0, buffer@^5.6.0:
version "5.7.1"
resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -14743,7 +14616,7 @@ contentful-sdk-core@^8.1.0:
p-throttle "^4.1.1"
qs "^6.11.2"
-contentful@^10.8.7:
+contentful@^10.3.6, contentful@^10.8.7:
version "10.12.10"
resolved "https://registry.yarnpkg.com/contentful/-/contentful-10.12.10.tgz#b9c47e64febcc87975f2486d77c7d014402a437c"
integrity sha512-YVc+aCvehjsJI8K/IglbLjEAl/fiyUzorCFrgR60R4v44VMa4wmFJTrY48x+YQ7DPKZw5MzFk1wgeG74fxCN2g==
@@ -14987,6 +14860,11 @@ create-react-context@0.3.0:
gud "^1.0.0"
warning "^4.0.3"
+create-require@^1.1.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
+ integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
+
cron-parser@^4.5.0:
version "4.9.0"
resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-4.9.0.tgz#0340694af3e46a0894978c6f52a6dbb5c0f11ad5"
@@ -15664,6 +15542,11 @@ deprecated-react-native-prop-types@^4.2.3:
invariant "^2.2.4"
prop-types "^15.8.1"
+deprecation@^2.0.0:
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
+ integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
+
deps-regex@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/deps-regex/-/deps-regex-0.2.0.tgz#3ee7ddae5fd784f3accf29d5a711aa6e10044137"
@@ -15739,15 +15622,10 @@ detect-node@^2.0.4:
resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
-detox-copilot@^0.0.9:
- version "0.0.9"
- resolved "https://registry.yarnpkg.com/detox-copilot/-/detox-copilot-0.0.9.tgz#cc1ddd869868987d3527c93d2604b5d66f3c8466"
- integrity sha512-Wk2fuisD8EH+349b0ysNWvZ7UEsThAChbYFlLqOR1jWkDaonEvgf6IOUlmxjvyTl9ENtl8ckd1U7k94yCBYwqw==
-
-detox@20.27.2:
- version "20.27.2"
- resolved "https://registry.yarnpkg.com/detox/-/detox-20.27.2.tgz#aa22a146b968b6e5f78687557081cf32d26ca066"
- integrity sha512-cC6S40v7ix+uA5jYzG8eazSs7YtOWgc2aCwWLZIIzfE5Kvo0gfHgtqeRhrYWCMZaj/irKKs39h2B070oNQOIrA==
+detox@20.23.1:
+ version "20.23.1"
+ resolved "https://registry.yarnpkg.com/detox/-/detox-20.23.1.tgz#57970c4bd7bdfc35f395c98106bbfb4be1c65150"
+ integrity sha512-K3UWCatYokzQStXxBTqrWzX0pLUBUCngNY3jGL61q6b1UH37vXPziGtOjWmKZ9zDQlxWC/HT7QWSiJqHn81DwA==
dependencies:
ajv "^8.6.3"
bunyan "^1.8.12"
@@ -15755,7 +15633,6 @@ detox@20.27.2:
caf "^15.0.1"
chalk "^4.0.0"
child-process-promise "^2.2.0"
- detox-copilot "^0.0.9"
execa "^5.1.1"
find-up "^5.0.0"
fs-extra "^11.0.0"
@@ -18226,39 +18103,6 @@ findup-sync@^5.0.0:
micromatch "^4.0.4"
resolve-dir "^1.0.1"
-firebase@10.12.2:
- version "10.12.2"
- resolved "https://registry.yarnpkg.com/firebase/-/firebase-10.12.2.tgz#9049286c5fafb6d686bb19ad93c7bb4a9e8756c0"
- integrity sha512-ZxEdtSvP1I9su1yf32D8TIdgxtPgxwr6z3jYAR1TXS/t+fVfpoPc/N1/N2bxOco9mNjUoc+od34v5Fn4GeKs6Q==
- dependencies:
- "@firebase/analytics" "0.10.4"
- "@firebase/analytics-compat" "0.2.10"
- "@firebase/app" "0.10.5"
- "@firebase/app-check" "0.8.4"
- "@firebase/app-check-compat" "0.3.11"
- "@firebase/app-compat" "0.2.35"
- "@firebase/app-types" "0.9.2"
- "@firebase/auth" "1.7.4"
- "@firebase/auth-compat" "0.5.9"
- "@firebase/database" "1.0.5"
- "@firebase/database-compat" "1.0.5"
- "@firebase/firestore" "4.6.3"
- "@firebase/firestore-compat" "0.3.32"
- "@firebase/functions" "0.11.5"
- "@firebase/functions-compat" "0.3.11"
- "@firebase/installations" "0.6.7"
- "@firebase/installations-compat" "0.2.7"
- "@firebase/messaging" "0.12.9"
- "@firebase/messaging-compat" "0.2.9"
- "@firebase/performance" "0.6.7"
- "@firebase/performance-compat" "0.2.7"
- "@firebase/remote-config" "0.4.7"
- "@firebase/remote-config-compat" "0.2.7"
- "@firebase/storage" "0.12.5"
- "@firebase/storage-compat" "0.3.8"
- "@firebase/util" "1.9.6"
- "@firebase/vertexai-preview" "0.0.2"
-
firebase@^10.11.0:
version "10.12.3"
resolved "https://registry.yarnpkg.com/firebase/-/firebase-10.12.3.tgz#b94510728f603a15367b95e12a00b366700ba7f8"
@@ -22223,6 +22067,11 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
dependencies:
semver "^6.0.0"
+make-error@^1.1.1:
+ version "1.3.6"
+ resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
+ integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
+
make-fetch-happen@^13.0.0:
version "13.0.1"
resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz#273ba2f78f45e1f3a6dca91cede87d9fa4821e36"
@@ -25630,14 +25479,6 @@ react-native-fade-in-image@1.4.1:
react-mixin "^3.0.5"
react-timer-mixin "^0.13.3"
-react-native-fast-crypto@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/react-native-fast-crypto/-/react-native-fast-crypto-2.2.0.tgz#062014a563ef34af30e1969ae4ae4b5cd6ab9e44"
- integrity sha512-JXQmnXGH3HpJYZrBsR7sL6cO/W3k1pHqTYbwnwTsJ8VUYXIsIEf1T0nMk6Z+XkQNI8RIQOeWJ9AuZLai4onHZg==
- dependencies:
- buffer "^5.0.8"
- rfc4648 "^1.0.0"
-
react-native-flash-message@0.1.11:
version "0.1.11"
resolved "https://registry.yarnpkg.com/react-native-flash-message/-/react-native-flash-message-0.1.11.tgz#29be9e77847e6a540aee7ba46add0b9de43f52ff"
@@ -26887,11 +26728,6 @@ revalidator@0.1.x:
resolved "https://registry.yarnpkg.com/revalidator/-/revalidator-0.1.8.tgz#fece61bfa0c1b52a206bd6b18198184bdd523a3b"
integrity sha1-/s5hv6DBtSoga9axgZgYS91SOjs=
-rfc4648@^1.0.0:
- version "1.5.3"
- resolved "https://registry.yarnpkg.com/rfc4648/-/rfc4648-1.5.3.tgz#e62b81736c10361ca614efe618a566e93d0b41c0"
- integrity sha512-MjOWxM065+WswwnmNONOT+bD1nXzY9Km6u3kzvnx8F8/HXGZdz3T6e6vZJ8Q/RIMUSp/nxqjH3GwvJDy8ijeQQ==
-
rfdc@^1.3.0, rfdc@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.1.tgz#2b6d4df52dffe8bb346992a10ea9451f24373a8f"
@@ -27524,7 +27360,7 @@ simple-get@^4.0.0, simple-get@^4.0.1:
once "^1.3.1"
simple-concat "^1.0.0"
-simple-git@^3.25.0:
+simple-git@^3.22.0:
version "3.25.0"
resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-3.25.0.tgz#3666e76d6831f0583dc380645945b97e0ac4aab6"
integrity sha512-KIY5sBnzc4yEcJXW7Tdv4viEz8KyG+nU0hay+DWZasvdFOYKeUZ6Xc25LUHHjw0tinPT7O1eY6pzX7pRT1K8rw==
@@ -28796,6 +28632,25 @@ ts-dedent@^2.0.0:
resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-2.2.0.tgz#39e4bd297cd036292ae2394eb3412be63f563bb5"
integrity sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==
+ts-node@^10.5.0:
+ version "10.9.1"
+ resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
+ integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
+ dependencies:
+ "@cspotcode/source-map-support" "^0.8.0"
+ "@tsconfig/node10" "^1.0.7"
+ "@tsconfig/node12" "^1.0.7"
+ "@tsconfig/node14" "^1.0.0"
+ "@tsconfig/node16" "^1.0.2"
+ acorn "^8.4.1"
+ acorn-walk "^8.1.1"
+ arg "^4.1.0"
+ create-require "^1.1.0"
+ diff "^4.0.1"
+ make-error "^1.1.1"
+ v8-compile-cache-lib "^3.0.1"
+ yn "3.1.1"
+
ts-toolbelt@^6.15.1:
version "6.15.5"
resolved "https://registry.yarnpkg.com/ts-toolbelt/-/ts-toolbelt-6.15.5.tgz#cb3b43ed725cb63644782c64fbcad7d8f28c0a83"
@@ -28840,6 +28695,11 @@ tunnel-agent@^0.6.0:
dependencies:
safe-buffer "^5.0.1"
+tunnel@^0.0.6:
+ version "0.0.6"
+ resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
+ integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
+
tweetnacl@^0.14.3, tweetnacl@~0.14.0:
version "0.14.5"
resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
@@ -29080,7 +28940,7 @@ undici-types@~5.26.4:
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-undici@5.28.4:
+undici@5.28.4, undici@^5.25.4:
version "5.28.4"
resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.4.tgz#6b280408edb6a1a604a9b20340f45b422e373068"
integrity sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==
@@ -29145,6 +29005,11 @@ unique-slug@^4.0.0:
dependencies:
imurmurhash "^0.1.4"
+universal-user-agent@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
+ integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==
+
universal-user-agent@^7.0.0, universal-user-agent@^7.0.2:
version "7.0.2"
resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-7.0.2.tgz#52e7d0e9b3dc4df06cc33cb2b9fd79041a54827e"
@@ -29459,6 +29324,11 @@ uuid@^9.0.0, uuid@^9.0.1:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
+v8-compile-cache-lib@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
+ integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
+
v8-to-istanbul@^9.0.1:
version "9.1.0"
resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz#1b83ed4e397f58c85c266a570fc2558b5feb9265"
@@ -30489,6 +30359,11 @@ ylru@^1.2.0:
resolved "https://registry.yarnpkg.com/ylru/-/ylru-1.3.2.tgz#0de48017473275a4cbdfc83a1eaf67c01af8a785"
integrity sha512-RXRJzMiK6U2ye0BlGGZnmpwJDPgakn6aNQ0A7gHRbD4I0uvK4TW6UqkK1V0pp9jskjJBAXd3dRrbzWkqJ+6cxA==
+yn@3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+ integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
+
yocto-queue@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"