From d4cc2d2dbd56118c4b403e2cc4ddc6c7d206ac60 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Fri, 15 Sep 2023 14:38:54 -0230 Subject: [PATCH 001/219] Version v11.2.0 --- CHANGELOG.md | 5 ++++- package.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4225375f477a..d43da1156375 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [11.2.0] + ## [11.1.0] ## [11.0.0] @@ -3973,7 +3975,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Uncategorized - Added the ability to restore accounts from seed words. -[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.1.0...HEAD +[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.2.0...HEAD +[11.2.0]: https://github.com/MetaMask/metamask-extension/compare/v11.1.0...v11.2.0 [11.1.0]: https://github.com/MetaMask/metamask-extension/compare/v11.0.0...v11.1.0 [11.0.0]: https://github.com/MetaMask/metamask-extension/compare/v10.35.1...v11.0.0 [10.35.1]: https://github.com/MetaMask/metamask-extension/compare/v10.35.0...v10.35.1 diff --git a/package.json b/package.json index 529ec9106d7a..b4cc7756b7d4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask-crx", - "version": "11.1.0", + "version": "11.2.0", "private": true, "repository": { "type": "git", From b489d64ca52422b5229df741da6f762b4c378e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= Date: Tue, 19 Sep 2023 13:53:54 +0100 Subject: [PATCH 002/219] [MMI] updates the "connect custodian account" flow (#20387) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * adds stories file and unit test * adds the logic to open custodian url or not * lint * fixes styles, and clean up * test update * remove unused locale * small update * lint * ran verify locales fix * fix typo * updates code with configuration api v2 * clean up * lint and prettier * test fix * prettier * packages update * updates for config v2 * updates for config v2 * clean up * Update LavaMoat policies --------- Co-authored-by: Albert Olivé Co-authored-by: MetaMask Bot Co-authored-by: Danica Shen --- app/_locales/de/messages.json | 9 -- app/_locales/el/messages.json | 9 -- app/_locales/en/messages.json | 31 +++-- app/_locales/es/messages.json | 9 -- app/_locales/fr/messages.json | 9 -- app/_locales/hi/messages.json | 9 -- app/_locales/id/messages.json | 9 -- app/_locales/ja/messages.json | 9 -- app/_locales/ko/messages.json | 9 -- app/_locales/pt/messages.json | 9 -- app/_locales/ru/messages.json | 9 -- app/_locales/tl/messages.json | 9 -- app/_locales/tr/messages.json | 9 -- app/_locales/vi/messages.json | 9 -- app/_locales/zh_CN/messages.json | 9 -- builds.yml | 2 +- lavamoat/browserify/mmi/policy.json | 3 +- package.json | 10 +- .../find-by-custodian-name.test.ts | 53 +++++++++ .../institutional/find-by-custodian-name.ts | 35 ++++++ .../confirm-add-custodian-token.js | 111 ++++++------------ .../confirm-add-custodian-token.test.js | 19 +-- .../confirm-connect-custodian-modal.js | 99 ++++++++++++++++ ...confirm-connect-custodian-modal.stories.js | 23 ++++ .../confirm-connect-custodian-modal.test.js | 42 +++++++ .../confirm-connect-custodian-modal/index.js | 1 + ui/pages/institutional/custody/custody.js | 45 ++++++- .../institutional/custody/custody.test.js | 7 +- .../institutional-entity-done-page.js | 37 +++--- yarn.lock | 84 ++++++------- 30 files changed, 417 insertions(+), 311 deletions(-) create mode 100644 ui/helpers/utils/institutional/find-by-custodian-name.test.ts create mode 100644 ui/helpers/utils/institutional/find-by-custodian-name.ts create mode 100644 ui/pages/institutional/confirm-connect-custodian-modal/confirm-connect-custodian-modal.js create mode 100644 ui/pages/institutional/confirm-connect-custodian-modal/confirm-connect-custodian-modal.stories.js create mode 100644 ui/pages/institutional/confirm-connect-custodian-modal/confirm-connect-custodian-modal.test.js create mode 100644 ui/pages/institutional/confirm-connect-custodian-modal/index.js diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index 0000e0c1ebc6..730cd338ff57 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -371,9 +371,6 @@ "amount": { "message": "Betrag" }, - "apiUrl": { - "message": "API-URL" - }, "appDescription": { "message": "Ethereum Browsererweiterung", "description": "The description of the application" @@ -981,9 +978,6 @@ "custodian": { "message": "Verwahrer" }, - "custodianAccount": { - "message": "Verwahrungskonto" - }, "custodianAccountAddedDesc": { "message": "Sie können jetzt Verwahrungskonten in MetaMask Institutional verwenden." }, @@ -2346,9 +2340,6 @@ "missingSettingRequest": { "message": "Hier anfragen" }, - "mmiAddToken": { - "message": "Die Seite bei $1 möchte das folgende Verwahrungstoken in MetaMask Institutional autorisieren." - }, "mmiBuiltAroundTheWorld": { "message": "MetaMask Institutional ist weltweit konzipiert und aufgebaut." }, diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index 5cd056ebbbae..132e7a9ddc72 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -371,9 +371,6 @@ "amount": { "message": "Ποσό" }, - "apiUrl": { - "message": "API URL" - }, "appDescription": { "message": "Ένα Πορτοφόλι Ethereum στο Πρόγραμμα Περιήγησής σας", "description": "The description of the application" @@ -981,9 +978,6 @@ "custodian": { "message": "Θεματοφύλακας" }, - "custodianAccount": { - "message": "Λογαριασμός θεματοφύλακα" - }, "custodianAccountAddedDesc": { "message": "Μπορείτε τώρα να χρησιμοποιήσετε τους λογαριασμούς θεματοφύλακά σας στο MetaMask Institutional." }, @@ -2346,9 +2340,6 @@ "missingSettingRequest": { "message": "Υποβάλετε αίτημα εδώ" }, - "mmiAddToken": { - "message": "Η σελίδα στο $1 θα ήθελε να εξουσιοδοτήσει το ακόλουθο token θεματοφύλακα στο MetaMask Institutional" - }, "mmiBuiltAroundTheWorld": { "message": "Το MetaMask Institutional έχει σχεδιαστεί και λειτουργεί σε όλο τον κόσμο." }, diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 6092721aa172..d851b2529421 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -351,9 +351,15 @@ "message": "All of your NFTs from $1", "description": "$1 is a link to contract on the block explorer when we're not able to retrieve a erc721 or erc1155 name" }, + "allow": { + "message": "Allow" + }, "allowExternalExtensionTo": { "message": "Allow this external extension to:" }, + "allowMmiToConnectToCustodian": { + "message": "This will allow MMI to connect to $1 to import your accounts." + }, "allowSpendToken": { "message": "Give permission to access your $1?", "description": "$1 is the symbol of the token that are requesting to spend" @@ -371,9 +377,6 @@ "amount": { "message": "Amount" }, - "apiUrl": { - "message": "API URL" - }, "appDescription": { "message": "An Ethereum Wallet in your Browser", "description": "The description of the application" @@ -732,6 +735,15 @@ "confirm": { "message": "Confirm" }, + "confirmConnectCustodianRedirect": { + "message": "We will redirect you to $1 upon clicking continue." + }, + "confirmConnectCustodianText": { + "message": "To connect your accounts log into your $1 account and click on the 'connect to MMI' button." + }, + "confirmConnectionTitle": { + "message": "Confirm connection to $1" + }, "confirmPassword": { "message": "Confirm password" }, @@ -765,6 +777,9 @@ "connectCustodialAccountTitle": { "message": "Custodial Accounts" }, + "connectCustodianAccounts": { + "message": "Connect $1 accounts" + }, "connectManually": { "message": "Manually connect to current site" }, @@ -981,14 +996,11 @@ "custodian": { "message": "Custodian" }, - "custodianAccount": { - "message": "Custodian account" - }, "custodianAccountAddedDesc": { - "message": "You can now use your custodian accounts in MetaMask Institutional." + "message": "You can now use your accounts in MetaMask Institutional." }, "custodianAccountAddedTitle": { - "message": "Selected custodian accounts have been added." + "message": "Selected $1 accounts have been added." }, "custodianReplaceRefreshTokenChangedFailed": { "message": "Please go to $1 and click the 'Connect to MMI' button within their user interface to connect your accounts to MMI again." @@ -2346,9 +2358,6 @@ "missingSettingRequest": { "message": "Request here" }, - "mmiAddToken": { - "message": "The page at $1 would like to authorise the following custodian token in MetaMask Institutional" - }, "mmiBuiltAroundTheWorld": { "message": "MetaMask Institutional is designed and built around the world." }, diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 61f6fd18b123..a8c3be966f45 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -371,9 +371,6 @@ "amount": { "message": "Importe" }, - "apiUrl": { - "message": "URL de la API" - }, "appDescription": { "message": "Un monedero de Ethereum en el explorador", "description": "The description of the application" @@ -981,9 +978,6 @@ "custodian": { "message": "Custodio" }, - "custodianAccount": { - "message": "Cuenta custodiada" - }, "custodianAccountAddedDesc": { "message": "Ahora ya puede usar sus cuentas custodiadas en MetaMask Institutional." }, @@ -2346,9 +2340,6 @@ "missingSettingRequest": { "message": "Solicítelo aquí" }, - "mmiAddToken": { - "message": "A la página de $1 le gustaría autorizar el siguiente token custodiado en MetaMask Institutional" - }, "mmiBuiltAroundTheWorld": { "message": "MetaMask Institutional está diseñado y construido en todo el mundo." }, diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index a8cb8fc43363..5d92ea6756ee 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -371,9 +371,6 @@ "amount": { "message": "Montant" }, - "apiUrl": { - "message": "URL de l’API" - }, "appDescription": { "message": "Extension Ethereum pour navigateur", "description": "The description of the application" @@ -981,9 +978,6 @@ "custodian": { "message": "Dépôt" }, - "custodianAccount": { - "message": "Compte de dépôt" - }, "custodianAccountAddedDesc": { "message": "Vous pouvez maintenant utiliser vos comptes de dépôt dans MetaMask Institutional." }, @@ -2346,9 +2340,6 @@ "missingSettingRequest": { "message": "Demandez ici" }, - "mmiAddToken": { - "message": "La page à $1 souhaite autoriser le jeton de dépôt suivant dans MetaMask institutionnel" - }, "mmiBuiltAroundTheWorld": { "message": "MetaMask Institutional est conçu et établi dans le monde entier." }, diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index 7cdc108f1112..eaebc034dfc0 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -371,9 +371,6 @@ "amount": { "message": "अमाउंट" }, - "apiUrl": { - "message": "API URL" - }, "appDescription": { "message": "आपके ब्राउज़र में एक Ethereum वॉलेट", "description": "The description of the application" @@ -981,9 +978,6 @@ "custodian": { "message": "कस्टोडियन" }, - "custodianAccount": { - "message": "कस्टोडियन अकाउंट" - }, "custodianAccountAddedDesc": { "message": "अब आप MetaMask Institutional में अपने कस्टोडियन एकाउंट्स का इस्तेमाल कर सकते हैं।" }, @@ -2346,9 +2340,6 @@ "missingSettingRequest": { "message": "यहां रिक्वेस्ट करें" }, - "mmiAddToken": { - "message": "$1 पर मौजूद पेज MetaMask Institutional में निम्नलिखित कस्टोडियन टोकन को अधिकृत करना चाहता है" - }, "mmiBuiltAroundTheWorld": { "message": "MetaMask Institutional को दुनिया भर में डिजाइन किया और बनाया गया है।" }, diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index ce485b6e7837..e0d4921b4dac 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -371,9 +371,6 @@ "amount": { "message": "Jumlah" }, - "apiUrl": { - "message": "URL API" - }, "appDescription": { "message": "Dompet Ethereum pada Browser Anda", "description": "The description of the application" @@ -981,9 +978,6 @@ "custodian": { "message": "Kustodian" }, - "custodianAccount": { - "message": "Akun kustodian" - }, "custodianAccountAddedDesc": { "message": "Saat ini Anda dapat menggunakan akun kustodian di MetaMask Institutional." }, @@ -2346,9 +2340,6 @@ "missingSettingRequest": { "message": "Minta di sini" }, - "mmiAddToken": { - "message": "Halaman di $1 ingin mengotorisasi token kustodian berikut di MetaMask Institutional" - }, "mmiBuiltAroundTheWorld": { "message": "MetaMask Institutional dirancang dan dibangun di seluruh dunia." }, diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index 3464133a1e2b..0ce08bf3df7c 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -371,9 +371,6 @@ "amount": { "message": "金額" }, - "apiUrl": { - "message": "API URL" - }, "appDescription": { "message": "ブラウザにあるイーサリアムウォレット", "description": "The description of the application" @@ -981,9 +978,6 @@ "custodian": { "message": "カストディアン" }, - "custodianAccount": { - "message": "カストディアンアカウント" - }, "custodianAccountAddedDesc": { "message": "カストディアンアカウントをMetaMask Institutionalで使えるようになりました。" }, @@ -2346,9 +2340,6 @@ "missingSettingRequest": { "message": "ここからリクエスト" }, - "mmiAddToken": { - "message": "$1のページがMetaMask Institutionalで次のカストディアントークンの承認を求めています" - }, "mmiBuiltAroundTheWorld": { "message": "MetaMaskは、世界中でデザイン・開発されています。" }, diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index d8fc9a3b7bb8..294bcb5c82de 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -371,9 +371,6 @@ "amount": { "message": "금액" }, - "apiUrl": { - "message": "API URL" - }, "appDescription": { "message": "브라우저의 이더리움 지갑", "description": "The description of the application" @@ -981,9 +978,6 @@ "custodian": { "message": "수탁자" }, - "custodianAccount": { - "message": "수탁 계정" - }, "custodianAccountAddedDesc": { "message": "이제 MetaMask Institutional에서 수탁 계정을 사용할 수 있습니다." }, @@ -2346,9 +2340,6 @@ "missingSettingRequest": { "message": "여기에서 요청하세요" }, - "mmiAddToken": { - "message": "$1의 페이지는 다음과 같은 MetaMask 기관 수탁 토큰을 승인하려고 합니다" - }, "mmiBuiltAroundTheWorld": { "message": "MetaMask Institutional은 전 세계적으로 설계 및 구축되었습니다." }, diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index 9be840098d4e..03b770aeabd8 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -371,9 +371,6 @@ "amount": { "message": "Valor" }, - "apiUrl": { - "message": "URL da API" - }, "appDescription": { "message": "Uma carteira de Ethereum no seu navegador", "description": "The description of the application" @@ -981,9 +978,6 @@ "custodian": { "message": "Custodiante" }, - "custodianAccount": { - "message": "Conta custodiante" - }, "custodianAccountAddedDesc": { "message": "Agora você pode usar suas contas de custódia no MetaMask Institutional." }, @@ -2346,9 +2340,6 @@ "missingSettingRequest": { "message": "Solicite aqui" }, - "mmiAddToken": { - "message": "A página em $1 gostaria de autorizar o seguinte token de custodiante na MetaMask Institutional" - }, "mmiBuiltAroundTheWorld": { "message": "O MetaMask Institutional é projetado e desenvolvido ao redor do mundo." }, diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index 615acee30cfc..493b1f33bf1f 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -371,9 +371,6 @@ "amount": { "message": "Сумма" }, - "apiUrl": { - "message": "URL API" - }, "appDescription": { "message": "Кошелек Ethereum в вашем браузере", "description": "The description of the application" @@ -981,9 +978,6 @@ "custodian": { "message": "Депозитарий" }, - "custodianAccount": { - "message": "Депозитарный счет" - }, "custodianAccountAddedDesc": { "message": "Теперь вы можете использовать свои депозитарные счета в MetaMask Institutional." }, @@ -2346,9 +2340,6 @@ "missingSettingRequest": { "message": "Запросите здесь" }, - "mmiAddToken": { - "message": "Страница в $1 хочет авторизовать следующий токен депозитария в MetaMask Institutional" - }, "mmiBuiltAroundTheWorld": { "message": "MetaMask Institutional разработан и создан с учетом потребностей в разных частях мира." }, diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json index b6cb89849a2f..167d0fd77526 100644 --- a/app/_locales/tl/messages.json +++ b/app/_locales/tl/messages.json @@ -371,9 +371,6 @@ "amount": { "message": "Halaga" }, - "apiUrl": { - "message": "API URL" - }, "appDescription": { "message": "Ethereum Wallet sa iyong Browser", "description": "The description of the application" @@ -981,9 +978,6 @@ "custodian": { "message": "Tagapangalaga" }, - "custodianAccount": { - "message": "Account ng tagapangalaga" - }, "custodianAccountAddedDesc": { "message": "Maaari mo na ngayong gamitin ang iyong mga custodian account sa MetaMask Institutional." }, @@ -2346,9 +2340,6 @@ "missingSettingRequest": { "message": "Humiling dito" }, - "mmiAddToken": { - "message": "Ang pahina sa $1 ay nais pahintulutan ang sumusunod na tagapangalaga na token sa MetaMask Institutional" - }, "mmiBuiltAroundTheWorld": { "message": "Ang MetaMask Institutional ay dinisenyo at binuo sa buong mundo." }, diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index 57f96b4a585c..09e233a827f6 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -371,9 +371,6 @@ "amount": { "message": "Tutar" }, - "apiUrl": { - "message": "API URL" - }, "appDescription": { "message": "Tarayıcında bir Ethereum Cüzdanı", "description": "The description of the application" @@ -981,9 +978,6 @@ "custodian": { "message": "Saklayıcı Kurum" }, - "custodianAccount": { - "message": "Saklayıcı kurum hesabı" - }, "custodianAccountAddedDesc": { "message": "Artık saklayıcı kurum hesaplarınızı MetaMask Institutional'da kullanabilirsiniz." }, @@ -2346,9 +2340,6 @@ "missingSettingRequest": { "message": "Buradan talep et" }, - "mmiAddToken": { - "message": "$1 alanındaki sayfa MetaMask Institutional'daki aşağıdaki saklayıcı kurum tokenine yetki vermek istiyor" - }, "mmiBuiltAroundTheWorld": { "message": "MetaMask Institutional dünya çapında tasarlanmış ve yapılmıştır." }, diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index b7e7d3d06e1d..f78d61cc37fe 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -371,9 +371,6 @@ "amount": { "message": "Số tiền" }, - "apiUrl": { - "message": "URL API" - }, "appDescription": { "message": "Ví Ethereum trên trình duyệt của bạn", "description": "The description of the application" @@ -981,9 +978,6 @@ "custodian": { "message": "Lưu ký" }, - "custodianAccount": { - "message": "Tài khoản lưu ký" - }, "custodianAccountAddedDesc": { "message": "Giờ đây bạn có thể sử dụng tài khoản lưu ký của mình trong MetaMask Institutional." }, @@ -2346,9 +2340,6 @@ "missingSettingRequest": { "message": "Yêu cầu tại đây" }, - "mmiAddToken": { - "message": "Trang tại $1 muốn ủy quyền token lưu ký sau trong MetaMask Institutional" - }, "mmiBuiltAroundTheWorld": { "message": "MetaMask Institutional được thiết kế và xây dựng trên khắp thế giới." }, diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index 25db029fac40..62fdb4d56b6a 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -371,9 +371,6 @@ "amount": { "message": "数额" }, - "apiUrl": { - "message": "API URL" - }, "appDescription": { "message": "浏览器中的以太坊钱包", "description": "The description of the application" @@ -981,9 +978,6 @@ "custodian": { "message": "托管人" }, - "custodianAccount": { - "message": "托管账户" - }, "custodianAccountAddedDesc": { "message": "您现在可以在 MetaMask Institutional 使用您的托管账户。 " }, @@ -2346,9 +2340,6 @@ "missingSettingRequest": { "message": "在这里请求" }, - "mmiAddToken": { - "message": "$1的页面想在 MetaMask Institutional 中授权以下托管代币" - }, "mmiBuiltAroundTheWorld": { "message": "MetaMask Institutional 面向全球各地设计并建立。" }, diff --git a/builds.yml b/builds.yml index 5ad53a2ff993..e0e133afbc5f 100644 --- a/builds.yml +++ b/builds.yml @@ -92,7 +92,7 @@ buildTypes: - SEGMENT_MMI_WRITE_KEY - INFURA_ENV_KEY_REF: INFURA_MMI_PROJECT_ID - SEGMENT_WRITE_KEY_REF: SEGMENT_MMI_WRITE_KEY - - MMI_CONFIGURATION_SERVICE_URL: https://configuration.metamask-institutional.io/v1/configuration/default + - MMI_CONFIGURATION_SERVICE_URL: https://configuration.metamask-institutional.io/v2/configuration/default - SUPPORT_LINK: https://mmi-support.zendesk.com/hc/en-us - SUPPORT_REQUEST_LINK: https://mmi-support.zendesk.com/hc/en-us/requests/new # For some reason, MMI uses this type of versioning diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index 578f541b1d3e..1ed715b4d89a 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -761,8 +761,7 @@ }, "@metamask-institutional/extension": { "globals": { - "console.log": true, - "fetch": true + "console.log": true }, "packages": { "@ethereumjs/tx>@ethereumjs/util": true, diff --git a/package.json b/package.json index b4cc7756b7d4..5274641bc3f5 100644 --- a/package.json +++ b/package.json @@ -224,14 +224,14 @@ "@keystonehq/metamask-airgapped-keyring": "^0.13.1", "@lavamoat/snow": "^1.5.0", "@material-ui/core": "^4.11.0", - "@metamask-institutional/custody-controller": "^0.2.10", - "@metamask-institutional/custody-keyring": "^0.0.27", - "@metamask-institutional/extension": "^0.3.3", - "@metamask-institutional/institutional-features": "^1.2.2", + "@metamask-institutional/custody-controller": "^0.2.12", + "@metamask-institutional/custody-keyring": "^1.0.1", + "@metamask-institutional/extension": "^0.3.5", + "@metamask-institutional/institutional-features": "^1.2.4", "@metamask-institutional/portfolio-dashboard": "^1.4.0", "@metamask-institutional/rpc-allowlist": "^1.0.0", "@metamask-institutional/sdk": "^0.1.18", - "@metamask-institutional/transaction-update": "^0.1.25", + "@metamask-institutional/transaction-update": "^0.1.27", "@metamask/address-book-controller": "^3.0.0", "@metamask/announcement-controller": "^4.0.0", "@metamask/approval-controller": "^3.4.0", diff --git a/ui/helpers/utils/institutional/find-by-custodian-name.test.ts b/ui/helpers/utils/institutional/find-by-custodian-name.test.ts new file mode 100644 index 000000000000..86cdb977e4ba --- /dev/null +++ b/ui/helpers/utils/institutional/find-by-custodian-name.test.ts @@ -0,0 +1,53 @@ +import { findCustodianByDisplayName } from './find-by-custodian-name'; + +describe('findCustodianByDisplayName', () => { + const custodians = [ + { + type: 'JSONRPC', + iconUrl: '', + name: 'Qredo', + website: 'https://www.qredo.com/', + envName: 'qredo', + apiUrl: null, + displayName: null, + production: false, + refreshTokenUrl: null, + websocketApiUrl: 'wss://websocket.dev.metamask-institutional.io/v1/ws', + isNoteToTraderSupported: true, + version: 2, + }, + { + type: 'JSONRPC', + iconUrl: + 'https://saturn-custody-ui.dev.metamask-institutional.io/saturn.svg', + name: 'Saturn Custody', + website: 'https://saturn-custody-ui.dev.metamask-institutional.io/', + envName: 'saturn', + apiUrl: 'https://saturn-custody.dev.metamask-institutional.io/eth', + displayName: null, + production: false, + refreshTokenUrl: + 'https://saturn-custody.dev.metamask-institutional.io/oauth/token', + websocketApiUrl: 'wss://websocket.dev.metamask-institutional.io/v1/ws', + isNoteToTraderSupported: true, + version: 2, + }, + ]; + it('should return the custodian if the display name is found in custodianKey', () => { + const displayName = 'Qredo'; + const custodian = findCustodianByDisplayName(displayName, custodians); + expect(custodian?.name).toBe('Qredo'); + }); + + it('should return the custodian if the display name is found in custodianDisplayName', () => { + const displayName = 'Saturn Custody'; + const custodian = findCustodianByDisplayName(displayName, custodians); + expect(custodian?.name).toContain('Saturn'); + }); + + it('should return null if no matching custodian is found', () => { + const displayName = 'Non-existent Custodian'; + const custodian = findCustodianByDisplayName(displayName, custodians); + expect(custodian).toBeNull(); + }); +}); diff --git a/ui/helpers/utils/institutional/find-by-custodian-name.ts b/ui/helpers/utils/institutional/find-by-custodian-name.ts new file mode 100644 index 000000000000..52a05b3b7b27 --- /dev/null +++ b/ui/helpers/utils/institutional/find-by-custodian-name.ts @@ -0,0 +1,35 @@ +type Custodian = { + type: string; + iconUrl: string; + name: string; + website: string; + envName: string; + apiUrl: string | null; + displayName: string | null; + production: boolean; + refreshTokenUrl: string | null; + websocketApiUrl: string; + isNoteToTraderSupported: boolean; + version: number; +}; + +export function findCustodianByDisplayName( + displayName: string, + custodians: Custodian[], +): Custodian | null { + const formatedDisplayName = displayName.toLowerCase(); + + if (!custodians) { + return null; + } + + for (const custodian of custodians) { + const custodianName = custodian.name.toLowerCase(); + + if (formatedDisplayName.includes(custodianName)) { + return custodian; + } + } + + return null; // no matching custodian is found +} diff --git a/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.js b/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.js index f8d867f6aa56..c30dad8efee5 100644 --- a/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.js +++ b/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.js @@ -5,21 +5,22 @@ import { useHistory } from 'react-router-dom'; import PulseLoader from '../../../components/ui/pulse-loader'; import { CUSTODY_ACCOUNT_ROUTE } from '../../../helpers/constants/routes'; import { - AlignItems, Display, TextColor, TextAlign, - FlexDirection, + FontWeight, + TextVariant, + BorderColor, } from '../../../helpers/constants/design-system'; +import Chip from '../../../components/ui/chip'; import { BUILT_IN_NETWORKS } from '../../../../shared/constants/network'; import { I18nContext } from '../../../contexts/i18n'; import { MetaMetricsContext } from '../../../contexts/metametrics'; import { getMostRecentOverviewPage } from '../../../ducks/history/history'; import { setProviderType } from '../../../store/actions'; import { mmiActionsFactory } from '../../../store/institutional/institution-background'; +import { getMMIConfiguration } from '../../../selectors/institutional/selectors'; import { - Label, - ButtonLink, Button, BUTTON_SIZES, BUTTON_VARIANT, @@ -31,6 +32,7 @@ import { MetaMetricsEventName, } from '../../../../shared/constants/metametrics'; import { getInstitutionalConnectRequests } from '../../../ducks/institutional/institutional'; +import { findCustodianByDisplayName } from '../../../helpers/utils/institutional/find-by-custodian-name'; const ConfirmAddCustodianToken = () => { const t = useContext(I18nContext); @@ -39,9 +41,9 @@ const ConfirmAddCustodianToken = () => { const trackEvent = useContext(MetaMetricsContext); const mmiActions = mmiActionsFactory(); + const { custodians } = useSelector(getMMIConfiguration); const mostRecentOverviewPage = useSelector(getMostRecentOverviewPage); const connectRequests = useSelector(getInstitutionalConnectRequests, isEqual); - const [showMore, setShowMore] = useState(false); const [isLoading, setIsLoading] = useState(false); const [connectError, setConnectError] = useState(''); @@ -68,7 +70,7 @@ const ConfirmAddCustodianToken = () => { }, }); - let custodianLabel = ''; + let custodianLabel = t('custodian'); if ( connectRequest.labels && @@ -79,81 +81,38 @@ const ConfirmAddCustodianToken = () => { ).value; } + const custodian = findCustodianByDisplayName(custodianLabel, custodians); + return ( - - {t('custodianAccount')} - - {t('mmiAddToken', [connectRequest.origin])} - + + - {custodianLabel && ( - <> - - {t('custodian')} - - - - )} - - - {t('token')} + + {t('confirmConnectionTitle', [custodianLabel])} - - - - {showMore && connectRequest?.token - ? connectRequest?.token - : `...${connectRequest?.token.slice(-9)}`} - - {!showMore && ( - - { - setShowMore(true); - }} - > - {t('showMore')} - - - )} - - - {connectRequest.apiUrl && ( - - - {t('apiUrl')} - - - {connectRequest.apiUrl} - - - )} + {t('allowMmiToConnectToCustodian', [custodianLabel])} + @@ -258,7 +217,7 @@ const ConfirmAddCustodianToken = () => { } }} > - {t('confirm')} + {t('allow')} )} diff --git a/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.test.js b/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.test.js index 8fafcdd864eb..cc0c0b1cc5c4 100644 --- a/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.test.js +++ b/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.test.js @@ -50,23 +50,6 @@ describe('Confirm Add Custodian Token', () => { const store = configureMockStore()(mockStore); - it('opens confirm add custodian token with correct token', () => { - renderWithProvider(, store); - - const tokenContainer = screen.getByText('...testToken'); - expect(tokenContainer).toBeInTheDocument(); - }); - - it('shows the custodian on cancel click', () => { - renderWithProvider(, store); - - const cancelButton = screen.getByTestId('cancel-btn'); - - fireEvent.click(cancelButton); - - expect(screen.getByText('Custodian')).toBeInTheDocument(); - }); - it('tries to connect to custodian with empty token', async () => { const customMockedStore = { metamask: { @@ -119,7 +102,7 @@ describe('Confirm Add Custodian Token', () => { const confirmButton = screen.getByTestId('confirm-btn'); fireEvent.click(confirmButton); - expect(screen.getByText('test')).toBeInTheDocument(); + expect(screen.getByText('Confirm connection to test')).toBeInTheDocument(); }); it('shows the error area', () => { diff --git a/ui/pages/institutional/confirm-connect-custodian-modal/confirm-connect-custodian-modal.js b/ui/pages/institutional/confirm-connect-custodian-modal/confirm-connect-custodian-modal.js new file mode 100644 index 000000000000..b3269b2ad607 --- /dev/null +++ b/ui/pages/institutional/confirm-connect-custodian-modal/confirm-connect-custodian-modal.js @@ -0,0 +1,99 @@ +import PropTypes from 'prop-types'; +import React, { useContext } from 'react'; +import { + AlignItems, + Display, + TextColor, + FlexDirection, + TextAlign, +} from '../../../helpers/constants/design-system'; +import { I18nContext } from '../../../contexts/i18n'; +import { + Button, + BUTTON_VARIANT, + Box, + Text, + Modal, + ModalOverlay, + ModalContent, + ModalHeader, +} from '../../../components/component-library'; + +const ConfirmConnectCustodianModal = ({ + onModalClose, + custodianName, + custodianURL, +}) => { + const t = useContext(I18nContext); + + return ( + + + + + {t('connectCustodianAccounts', [custodianName])} + + + + {t('confirmConnectCustodianText', [custodianName])} + + + + {t('confirmConnectCustodianRedirect', [custodianURL])} + + + + + + + + + + ); +}; + +export default ConfirmConnectCustodianModal; + +ConfirmConnectCustodianModal.propTypes = { + onModalClose: PropTypes.func.isRequired, + custodianName: PropTypes.string.isRequired, + custodianURL: PropTypes.string.isRequired, +}; diff --git a/ui/pages/institutional/confirm-connect-custodian-modal/confirm-connect-custodian-modal.stories.js b/ui/pages/institutional/confirm-connect-custodian-modal/confirm-connect-custodian-modal.stories.js new file mode 100644 index 000000000000..66585a421bfc --- /dev/null +++ b/ui/pages/institutional/confirm-connect-custodian-modal/confirm-connect-custodian-modal.stories.js @@ -0,0 +1,23 @@ +import React from 'react'; +import { Provider } from 'react-redux'; +import configureStore from '../../../store/store'; +import testData from '../../../../.storybook/test-data'; +import ConfirmConnectCustodianModal from '.'; + +const store = configureStore(testData); + +export default { + title: 'Components/Institutional/ConfirmConnectCustodianModal', + decorators: [(story) => {story()}], + component: ConfirmConnectCustodianModal, +}; + +export const DefaultStory = () => ( + +); + +DefaultStory.storyName = 'ConfirmConnectCustodianModal'; diff --git a/ui/pages/institutional/confirm-connect-custodian-modal/confirm-connect-custodian-modal.test.js b/ui/pages/institutional/confirm-connect-custodian-modal/confirm-connect-custodian-modal.test.js new file mode 100644 index 000000000000..83f2d631a5dd --- /dev/null +++ b/ui/pages/institutional/confirm-connect-custodian-modal/confirm-connect-custodian-modal.test.js @@ -0,0 +1,42 @@ +import React from 'react'; +import { screen } from '@testing-library/react'; +import configureMockStore from 'redux-mock-store'; +import { renderWithProvider } from '../../../../test/lib/render-helpers'; +import ConfirmAddCustodianToken from '.'; + +describe('Confirm Add Custodian Token', () => { + global.platform = { openTab: jest.fn() }; + + const mockStore = { + metamask: { + providerConfig: { + type: 'test', + }, + preferences: { + useNativeCurrencyAsPrimaryCurrency: true, + }, + }, + history: { + push: '/', + mostRecentOverviewPage: '/', + }, + }; + + const store = configureMockStore()(mockStore); + + it('shows the modal with its text', () => { + renderWithProvider( + console.log('Close')} + custodianName="Qredo" + custodianURL="https://qredo.com" + />, + store, + ); + + const tokenContainer = screen.getByText( + "To connect your accounts log into your Qredo account and click on the 'connect to MMI' button.", + ); + expect(tokenContainer).toBeInTheDocument(); + }); +}); diff --git a/ui/pages/institutional/confirm-connect-custodian-modal/index.js b/ui/pages/institutional/confirm-connect-custodian-modal/index.js new file mode 100644 index 000000000000..99ed12dcdad1 --- /dev/null +++ b/ui/pages/institutional/confirm-connect-custodian-modal/index.js @@ -0,0 +1 @@ +export { default } from './confirm-connect-custodian-modal'; diff --git a/ui/pages/institutional/custody/custody.js b/ui/pages/institutional/custody/custody.js index 1f017e90a9bd..5d078b03b5b5 100644 --- a/ui/pages/institutional/custody/custody.js +++ b/ui/pages/institutional/custody/custody.js @@ -39,6 +39,7 @@ import { } from '../../../helpers/constants/design-system'; import { CUSTODY_ACCOUNT_DONE_ROUTE, + CUSTODY_ACCOUNT_ROUTE, DEFAULT_ROUTE, } from '../../../helpers/constants/routes'; import { getCurrentChainId, getSelectedAddress } from '../../../selectors'; @@ -51,6 +52,8 @@ import { MetaMetricsEventName, } from '../../../../shared/constants/metametrics'; import PulseLoader from '../../../components/ui/pulse-loader/pulse-loader'; +import ConfirmConnectCustodianModal from '../confirm-connect-custodian-modal'; +import { findCustodianByDisplayName } from '../../../helpers/utils/institutional/find-by-custodian-name'; const CustodyPage = () => { const t = useI18nContext(); @@ -63,11 +66,16 @@ const CustodyPage = () => { const { custodians } = useSelector(getMMIConfiguration); const [loading, setLoading] = useState(true); + const [ + isConfirmConnectCustodianModalVisible, + setIsConfirmConnectCustodianModalVisible, + ] = useState(false); const [selectedAccounts, setSelectedAccounts] = useState({}); const [selectedCustodianName, setSelectedCustodianName] = useState(''); const [selectedCustodianImage, setSelectedCustodianImage] = useState(null); const [selectedCustodianDisplayName, setSelectedCustodianDisplayName] = useState(''); + const [matchedCustodian, setMatchedCustodian] = useState(null); const [selectedCustodianType, setSelectedCustodianType] = useState(''); const [connectError, setConnectError] = useState(''); const [currentJwt, setCurrentJwt] = useState(''); @@ -158,16 +166,31 @@ const CustodyPage = () => { data-testid="custody-connect-button" onClick={async () => { try { + const custodianByDisplayName = findCustodianByDisplayName( + custodian.displayName, + custodians, + ); const jwtListValue = await dispatch( mmiActions.getCustodianJWTList(custodian.name), ); setSelectedCustodianName(custodian.name); - setSelectedCustodianType(custodian.type); - setSelectedCustodianImage(custodian.iconUrl); setSelectedCustodianDisplayName(custodian.displayName); + setSelectedCustodianImage(custodian.iconUrl); setApiUrl(custodian.apiUrl); setCurrentJwt(jwtListValue[0] || ''); setJwtList(jwtListValue); + + // open confirm Connect Custodian modal except for gk8 + if ( + custodianByDisplayName.displayName.toLocaleLowerCase() === + 'gk8' + ) { + setSelectedCustodianType(custodian.type); + } else { + setMatchedCustodian(custodianByDisplayName); + setIsConfirmConnectCustodianModalVisible(true); + } + trackEvent({ category: MetaMetricsEventCategory.MMI, event: MetaMetricsEventName.CustodianSelected, @@ -326,6 +349,8 @@ const CustodyPage = () => { setCurrentJwt(''); setConnectError(''); setSelectError(''); + + history.push(CUSTODY_ACCOUNT_ROUTE); }; const setSelectAllAccounts = (e) => { @@ -598,7 +623,9 @@ const CustodyPage = () => { pathname: CUSTODY_ACCOUNT_DONE_ROUTE, state: { imgSrc: selectedCustodian.iconUrl, - title: t('custodianAccountAddedTitle'), + title: t('custodianAccountAddedTitle', [ + selectedCustodian.displayName, + ]), description: t('custodianAccountAddedDesc'), }, }); @@ -615,9 +642,7 @@ const CustodyPage = () => { setApiUrl(''); setAddNewTokenClicked(false); - if (Object.keys(connectRequest).length) { - history.push(DEFAULT_ROUTE); - } + history.push(DEFAULT_ROUTE); trackEvent({ category: MetaMetricsEventCategory.MMI, @@ -663,6 +688,14 @@ const CustodyPage = () => { )} + + {isConfirmConnectCustodianModalVisible && ( + setIsConfirmConnectCustodianModalVisible(false)} + custodianName={selectedCustodianDisplayName} + custodianURL={matchedCustodian?.website} + /> + )} ); }; diff --git a/ui/pages/institutional/custody/custody.test.js b/ui/pages/institutional/custody/custody.test.js index 22612a45637b..e0cdc16585f8 100644 --- a/ui/pages/institutional/custody/custody.test.js +++ b/ui/pages/institutional/custody/custody.test.js @@ -85,7 +85,7 @@ describe('CustodyPage', function () { }); }); - it('calls getCustodianJwtList on custody select when connect btn is click and clicks connect button and shows the jwt form', async () => { + it('calls getCustodianJwtList on custody select when connect btn is click and clicks connect button and shows the redirect to custodian modal', async () => { act(() => { renderWithProvider(, store); }); @@ -96,8 +96,9 @@ describe('CustodyPage', function () { }); await waitFor(() => { - expect(screen.getByTestId('jwt-form-connect-button')).toBeInTheDocument(); - expect(mockedGetCustodianJWTList).toHaveBeenCalled(); + expect( + screen.getByTestId('confirm-connect-custodian-modal'), + ).toBeInTheDocument(); }); }); }); diff --git a/ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.js b/ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.js index a7c134e91cd2..3b0e9e7f6c72 100644 --- a/ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.js +++ b/ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.js @@ -11,11 +11,11 @@ import { } from '../../../components/component-library'; import { TextColor, - TypographyVariant, Display, FlexDirection, AlignItems, - TextAlign, + TextVariant, + FontWeight, } from '../../../helpers/constants/design-system'; export default function InstitutionalEntityDonePage(props) { @@ -45,25 +45,20 @@ export default function InstitutionalEntityDonePage(props) { alt="Entity image" /> )} - - {state.title} - - - {state.description} - + + + {state.title} + + + + {state.description} + + diff --git a/yarn.lock b/yarn.lock index 701f81bc2f04..a68f41b9756e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3621,66 +3621,66 @@ __metadata: languageName: node linkType: hard -"@metamask-institutional/configuration-client@npm:^1.0.6": - version: 1.0.6 - resolution: "@metamask-institutional/configuration-client@npm:1.0.6" - checksum: 924ff201a99286aac332402dbc74884a72f5352f29ba066e788cd045b330df7775b2b247731db4ee453f2fee7f2662b61477703e70eb822f044895bdc858f79b +"@metamask-institutional/configuration-client@npm:^2.0.0": + version: 2.0.0 + resolution: "@metamask-institutional/configuration-client@npm:2.0.0" + checksum: 58856e9d2676110aede32d506d0c0602c4b9940bc810a1b7834ded52407f321d64bba08ce55de3e4be29dfc4e9d492ce1ee0fbab72b150c8e86feb8d99570699 languageName: node linkType: hard -"@metamask-institutional/custody-controller@npm:^0.2.10": - version: 0.2.10 - resolution: "@metamask-institutional/custody-controller@npm:0.2.10" +"@metamask-institutional/custody-controller@npm:^0.2.12": + version: 0.2.12 + resolution: "@metamask-institutional/custody-controller@npm:0.2.12" dependencies: "@ethereumjs/util": "npm:^8.0.5" - "@metamask-institutional/custody-keyring": "npm:^0.0.27" + "@metamask-institutional/custody-keyring": "npm:^1.0.1" "@metamask-institutional/sdk": "npm:^0.1.18" "@metamask-institutional/types": "npm:^1.0.3" "@metamask/obs-store": "npm:^8.0.0" - checksum: 4ab4c26649f7e7e6e37308b00b2aa21cf40c0a861435a54c49bf0e092b49cbef71189774bd8ca038ace57d561facb8f79a0d98ad55ef0196101a857508e447d9 + checksum: 62d54cf12b5ff00d8038261de835d07f654077c39a66081fb88d4c79d37227ef6671dfef437e2af925cf72576abd523013a0fa652845960d937c6e58afff796b languageName: node linkType: hard -"@metamask-institutional/custody-keyring@npm:^0.0.27": - version: 0.0.27 - resolution: "@metamask-institutional/custody-keyring@npm:0.0.27" +"@metamask-institutional/custody-keyring@npm:^1.0.1": + version: 1.0.1 + resolution: "@metamask-institutional/custody-keyring@npm:1.0.1" dependencies: "@ethereumjs/tx": "npm:^4.1.1" "@ethereumjs/util": "npm:^8.0.5" - "@metamask-institutional/configuration-client": "npm:^1.0.6" + "@metamask-institutional/configuration-client": "npm:^2.0.0" "@metamask-institutional/sdk": "npm:^0.1.18" "@metamask-institutional/types": "npm:^1.0.3" "@metamask/obs-store": "npm:^8.0.0" crypto: "npm:^1.0.1" lodash.clonedeep: "npm:^4.5.0" - checksum: f006671892e9abc3f72105a5276193f9194e54c51dd732affb632d1cf5d4cbfdc2c0b323e65b8265f1dedfb81dabd9ab2ce1e2c177ea5e791bd9af238b187336 + checksum: c9c763bd8416bd4434f4ae00d687f3bd33c6f4c6b7c299f0887e772e077b82291f59ecb6eebcac18cce56775887dfa8bc0a1be121d38ba35b5d5650bbb85ddf9 languageName: node linkType: hard -"@metamask-institutional/extension@npm:^0.3.3": - version: 0.3.3 - resolution: "@metamask-institutional/extension@npm:0.3.3" +"@metamask-institutional/extension@npm:^0.3.5": + version: 0.3.5 + resolution: "@metamask-institutional/extension@npm:0.3.5" dependencies: "@ethereumjs/util": "npm:^8.0.5" - "@metamask-institutional/custody-controller": "npm:^0.2.10" - "@metamask-institutional/custody-keyring": "npm:^0.0.27" + "@metamask-institutional/custody-controller": "npm:^0.2.12" + "@metamask-institutional/custody-keyring": "npm:^1.0.1" "@metamask-institutional/portfolio-dashboard": "npm:^1.4.0" "@metamask-institutional/sdk": "npm:^0.1.18" - "@metamask-institutional/transaction-update": "npm:^0.1.25" + "@metamask-institutional/transaction-update": "npm:^0.1.27" "@metamask-institutional/types": "npm:^1.0.3" jest-create-mock-instance: "npm:^2.0.0" jest-fetch-mock: "npm:3.0.3" - checksum: cb19b44b686dfa08bee0764c7ac8ff782f4ada8439e17d63b96700e043f07c406c727d1abe1c5d32ba97ecdb394748c8ed93b8d6ee9d5fafa9c3d66f13aa108d + checksum: a8b242d4837abc3812e01c38945428dcde0b29090e6c60d828c259f968378144c2e7e3f4bc3591f72232e0c037e6e3718627a65f45c3d446b96c45752e03eb4c languageName: node linkType: hard -"@metamask-institutional/institutional-features@npm:^1.2.2": - version: 1.2.2 - resolution: "@metamask-institutional/institutional-features@npm:1.2.2" +"@metamask-institutional/institutional-features@npm:^1.2.4": + version: 1.2.4 + resolution: "@metamask-institutional/institutional-features@npm:1.2.4" dependencies: - "@metamask-institutional/custody-keyring": "npm:^0.0.27" + "@metamask-institutional/custody-keyring": "npm:^1.0.1" "@metamask/obs-store": "npm:^8.0.0" - checksum: 2eb4cd7d36e38ba89a11e22c8522e1a091572e171abec71b6fa7b28b0f54c7fec0cbeb238d1066112dfbaf70075529f37f5aae55d65fa2639a73597a222b65a6 + checksum: 988dc946563c820951da37a1aba2905b3d4987332c72dc2131cce2a67fcbc6789fd3e73d9240c9c756cb73d1e28953bd8efd6b7c3828d3a90e6bd9ed72243cd7 languageName: node linkType: hard @@ -3719,17 +3719,17 @@ __metadata: languageName: node linkType: hard -"@metamask-institutional/transaction-update@npm:^0.1.25": - version: 0.1.25 - resolution: "@metamask-institutional/transaction-update@npm:0.1.25" +"@metamask-institutional/transaction-update@npm:^0.1.27": + version: 0.1.27 + resolution: "@metamask-institutional/transaction-update@npm:0.1.27" dependencies: - "@metamask-institutional/custody-keyring": "npm:^0.0.27" + "@metamask-institutional/custody-keyring": "npm:^1.0.1" "@metamask-institutional/sdk": "npm:^0.1.18" "@metamask-institutional/types": "npm:^1.0.3" - "@metamask-institutional/websocket-client": "npm:^0.1.27" + "@metamask-institutional/websocket-client": "npm:^0.1.29" "@metamask/obs-store": "npm:^8.0.0" ethereumjs-util: "npm:^7.1.5" - checksum: ee1c597a3e3ec3d226eb1a0cdda6ed3e098faab776eaeb30c5abbcf72efa4eceadbceefed51f6fc7fa92b45f02c0f0da732e2d600c13832d93f8ba449e4a31b5 + checksum: 1ff8db117aebf1c0131de0d89ca14d9a74ef8757187ad30e6ee7fd25859a2ce22a9a01f49efc33360bd9231ccce22ab89cc1bcea3d6a0ea915b2ee9d76cdc618 languageName: node linkType: hard @@ -3740,15 +3740,15 @@ __metadata: languageName: node linkType: hard -"@metamask-institutional/websocket-client@npm:^0.1.27": - version: 0.1.27 - resolution: "@metamask-institutional/websocket-client@npm:0.1.27" +"@metamask-institutional/websocket-client@npm:^0.1.29": + version: 0.1.29 + resolution: "@metamask-institutional/websocket-client@npm:0.1.29" dependencies: - "@metamask-institutional/custody-keyring": "npm:^0.0.27" + "@metamask-institutional/custody-keyring": "npm:^1.0.1" "@metamask-institutional/sdk": "npm:^0.1.18" "@metamask-institutional/types": "npm:^1.0.3" mock-socket: "npm:^9.2.1" - checksum: e35e36f0ceae33596848539f8a6dff7bb5867124b7bceece61abc21e603ef81db4d0d3f182edcda8e62552d4870e1f3f527bc489e6412a5ae8d88909e5c64af5 + checksum: 137d8d9c9a0672744022a92b04ed9b65d10cc34bba2bbcdb5b8ac7e7912ca25d6f8fc4d671ff973ee6dafbe58b6cbbad4aad3f35146363b03acdfa5d91d6b961 languageName: node linkType: hard @@ -24176,14 +24176,14 @@ __metadata: "@lavamoat/lavapack": "npm:^5.2.0" "@lavamoat/snow": "npm:^1.5.0" "@material-ui/core": "npm:^4.11.0" - "@metamask-institutional/custody-controller": "npm:^0.2.10" - "@metamask-institutional/custody-keyring": "npm:^0.0.27" - "@metamask-institutional/extension": "npm:^0.3.3" - "@metamask-institutional/institutional-features": "npm:^1.2.2" + "@metamask-institutional/custody-controller": "npm:^0.2.12" + "@metamask-institutional/custody-keyring": "npm:^1.0.1" + "@metamask-institutional/extension": "npm:^0.3.5" + "@metamask-institutional/institutional-features": "npm:^1.2.4" "@metamask-institutional/portfolio-dashboard": "npm:^1.4.0" "@metamask-institutional/rpc-allowlist": "npm:^1.0.0" "@metamask-institutional/sdk": "npm:^0.1.18" - "@metamask-institutional/transaction-update": "npm:^0.1.25" + "@metamask-institutional/transaction-update": "npm:^0.1.27" "@metamask/address-book-controller": "npm:^3.0.0" "@metamask/announcement-controller": "npm:^4.0.0" "@metamask/approval-controller": "npm:^3.4.0" From 8466d8896e4d54798e51911d70e595103b0d4308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= Date: Thu, 21 Sep 2023 14:21:51 +0100 Subject: [PATCH 003/219] [MMI] Updates custody-keyring package (#20982) * updates custody-keyring package * dedupe --- package.json | 2 +- ui/pages/institutional/custody/custody.js | 5 +++-- yarn.lock | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 5274641bc3f5..fd67921ef067 100644 --- a/package.json +++ b/package.json @@ -225,7 +225,7 @@ "@lavamoat/snow": "^1.5.0", "@material-ui/core": "^4.11.0", "@metamask-institutional/custody-controller": "^0.2.12", - "@metamask-institutional/custody-keyring": "^1.0.1", + "@metamask-institutional/custody-keyring": "^1.0.2", "@metamask-institutional/extension": "^0.3.5", "@metamask-institutional/institutional-features": "^1.2.4", "@metamask-institutional/portfolio-dashboard": "^1.4.0", diff --git a/ui/pages/institutional/custody/custody.js b/ui/pages/institutional/custody/custody.js index 5d078b03b5b5..70c60f1e214b 100644 --- a/ui/pages/institutional/custody/custody.js +++ b/ui/pages/institutional/custody/custody.js @@ -622,9 +622,10 @@ const CustodyPage = () => { history.push({ pathname: CUSTODY_ACCOUNT_DONE_ROUTE, state: { - imgSrc: selectedCustodian.iconUrl, + imgSrc: selectedCustodian && selectedCustodian.iconUrl, title: t('custodianAccountAddedTitle', [ - selectedCustodian.displayName, + (selectedCustodian && selectedCustodian.displayName) || + 'Custodian', ]), description: t('custodianAccountAddedDesc'), }, diff --git a/yarn.lock b/yarn.lock index a68f41b9756e..5b2f79c37f62 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3641,9 +3641,9 @@ __metadata: languageName: node linkType: hard -"@metamask-institutional/custody-keyring@npm:^1.0.1": - version: 1.0.1 - resolution: "@metamask-institutional/custody-keyring@npm:1.0.1" +"@metamask-institutional/custody-keyring@npm:^1.0.1, @metamask-institutional/custody-keyring@npm:^1.0.2": + version: 1.0.2 + resolution: "@metamask-institutional/custody-keyring@npm:1.0.2" dependencies: "@ethereumjs/tx": "npm:^4.1.1" "@ethereumjs/util": "npm:^8.0.5" @@ -3653,7 +3653,7 @@ __metadata: "@metamask/obs-store": "npm:^8.0.0" crypto: "npm:^1.0.1" lodash.clonedeep: "npm:^4.5.0" - checksum: c9c763bd8416bd4434f4ae00d687f3bd33c6f4c6b7c299f0887e772e077b82291f59ecb6eebcac18cce56775887dfa8bc0a1be121d38ba35b5d5650bbb85ddf9 + checksum: eff487de17a9d7ea889a953f9874ee0a55b568928c97bf93a90c33af52acfc8958d708d8fb4e4cd909ec0e57757409ac86476b6ab89b72b72b4f6559eab3b06b languageName: node linkType: hard @@ -24177,7 +24177,7 @@ __metadata: "@lavamoat/snow": "npm:^1.5.0" "@material-ui/core": "npm:^4.11.0" "@metamask-institutional/custody-controller": "npm:^0.2.12" - "@metamask-institutional/custody-keyring": "npm:^1.0.1" + "@metamask-institutional/custody-keyring": "npm:^1.0.2" "@metamask-institutional/extension": "npm:^0.3.5" "@metamask-institutional/institutional-features": "npm:^1.2.4" "@metamask-institutional/portfolio-dashboard": "npm:^1.4.0" From 3140afbfad246268b2f12f4a67fdd2b686e7435f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= Date: Fri, 22 Sep 2023 09:48:02 +0100 Subject: [PATCH 004/219] [MMI] clean up MMI Portfolio Dashboard URLs (#20990) * clean up urls * test update * lint --- shared/constants/swaps.ts | 2 -- ui/components/app/wallet-overview/eth-overview.js | 9 +++++---- ui/components/app/wallet-overview/eth-overview.test.js | 10 +++++++--- ui/components/app/wallet-overview/token-overview.js | 9 +++++---- .../select-action-modal/select-action-modal.js | 10 ++++++---- ui/helpers/constants/common.ts | 1 - 6 files changed, 23 insertions(+), 18 deletions(-) diff --git a/shared/constants/swaps.ts b/shared/constants/swaps.ts index 73e2926e7143..1b60dc8f95fc 100644 --- a/shared/constants/swaps.ts +++ b/shared/constants/swaps.ts @@ -142,8 +142,6 @@ export const WETH_ZKSYNC_ERA_CONTRACT_ADDRESS = const SWAPS_TESTNET_CHAIN_ID = '0x539'; -export const MMI_SWAPS_URL = 'https://metamask-institutional.io/swap'; - export const SWAPS_API_V2_BASE_URL = 'https://swap.metaswap.codefi.network'; export const SWAPS_DEV_API_V2_BASE_URL = 'https://swap.dev-api.cx.metamask.io'; export const GAS_API_BASE_URL = 'https://gas-api.metaswap.codefi.network'; diff --git a/ui/components/app/wallet-overview/eth-overview.js b/ui/components/app/wallet-overview/eth-overview.js index 4c10a8edded0..15695dd237b5 100644 --- a/ui/components/app/wallet-overview/eth-overview.js +++ b/ui/components/app/wallet-overview/eth-overview.js @@ -14,7 +14,6 @@ import { getMmiPortfolioEnabled, getMmiPortfolioUrl, } from '../../../selectors/institutional/selectors'; -import { MMI_SWAPS_URL } from '../../../../shared/constants/swaps'; ///: END:ONLY_INCLUDE_IN import { I18nContext } from '../../../contexts/i18n'; import { @@ -112,7 +111,7 @@ const EthOverview = ({ className, showAddress }) => { onClick={() => { stakingEvent(); global.platform.openTab({ - url: 'https://metamask-institutional.io/stake', + url: `${mmiPortfolioUrl}/stake`, }); }} /> @@ -125,7 +124,9 @@ const EthOverview = ({ className, showAddress }) => { label={t('portfolio')} onClick={() => { portfolioEvent(); - window.open(mmiPortfolioUrl, '_blank'); + global.platform.openTab({ + url: mmiPortfolioUrl, + }); }} /> )} @@ -262,7 +263,7 @@ const EthOverview = ({ className, showAddress }) => { onClick={() => { ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) global.platform.openTab({ - url: MMI_SWAPS_URL, + url: `${mmiPortfolioUrl}/swap`, }); ///: END:ONLY_INCLUDE_IN diff --git a/ui/components/app/wallet-overview/eth-overview.test.js b/ui/components/app/wallet-overview/eth-overview.test.js index 32e73fbee9a9..bad0339b6ed7 100644 --- a/ui/components/app/wallet-overview/eth-overview.test.js +++ b/ui/components/app/wallet-overview/eth-overview.test.js @@ -196,6 +196,12 @@ describe('EthOverview', () => { const mockedStoreWithCustodyKeyring = { metamask: { ...mockStore.metamask, + mmiConfiguration: { + portfolio: { + enabled: true, + url: 'https://metamask-institutional.io', + }, + }, keyrings: [ { type: 'Custody', @@ -224,9 +230,7 @@ describe('EthOverview', () => { await waitFor(() => expect(openTabSpy).toHaveBeenCalledWith({ - url: expect.stringContaining( - 'https://metamask-institutional.io/swap', - ), + url: 'https://metamask-institutional.io/swap', }), ); }); diff --git a/ui/components/app/wallet-overview/token-overview.js b/ui/components/app/wallet-overview/token-overview.js index cb7fcc4fd9a2..650404c86c5f 100644 --- a/ui/components/app/wallet-overview/token-overview.js +++ b/ui/components/app/wallet-overview/token-overview.js @@ -25,7 +25,6 @@ import { getMmiPortfolioEnabled, getMmiPortfolioUrl, } from '../../../selectors/institutional/selectors'; -import { MMI_SWAPS_URL } from '../../../../shared/constants/swaps'; ///: END:ONLY_INCLUDE_IN import { getIsSwapsChain, @@ -178,7 +177,7 @@ const TokenOverview = ({ className, token }) => { onClick={() => { stakingEvent(); global.platform.openTab({ - url: 'https://metamask-institutional.io/stake', + url: `${mmiPortfolioUrl}/stake`, }); }} /> @@ -195,7 +194,9 @@ const TokenOverview = ({ className, token }) => { data-testid="token-overview-mmi-portfolio" onClick={() => { portfolioEvent(); - window.open(mmiPortfolioUrl, '_blank'); + global.platform.openTab({ + url: mmiPortfolioUrl, + }); }} /> )} @@ -252,7 +253,7 @@ const TokenOverview = ({ className, token }) => { onClick={() => { ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) global.platform.openTab({ - url: MMI_SWAPS_URL, + url: `${mmiPortfolioUrl}/swap`, }); ///: END:ONLY_INCLUDE_IN diff --git a/ui/components/multichain/select-action-modal/select-action-modal.js b/ui/components/multichain/select-action-modal/select-action-modal.js index 404549292110..3a5ca27c5fc9 100644 --- a/ui/components/multichain/select-action-modal/select-action-modal.js +++ b/ui/components/multichain/select-action-modal/select-action-modal.js @@ -49,9 +49,9 @@ import { startNewDraftTransaction } from '../../../ducks/send'; import { I18nContext } from '../../../contexts/i18n'; import { AssetType } from '../../../../shared/constants/transaction'; ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) -import { MMI_SWAPS_URL } from '../../../../shared/constants/swaps'; -import { MMI_STAKE_WEBSITE } from '../../../helpers/constants/common'; +import { getMmiPortfolioUrl } from '../../../selectors/institutional/selectors'; ///: END:ONLY_INCLUDE_IN + ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-flask) import { setSwapsFromToken } from '../../../ducks/swaps/swaps'; import { isHardwareKeyring } from '../../../helpers/utils/hardware'; @@ -79,6 +79,8 @@ export const SelectActionModal = ({ onClose }) => { ///: END:ONLY_INCLUDE_IN ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + const mmiPortfolioUrl = useSelector(getMmiPortfolioUrl); + const stakingEvent = () => { trackEvent({ category: MetaMetricsEventCategory.Navigation, @@ -136,7 +138,7 @@ export const SelectActionModal = ({ onClose }) => { onClick={() => { stakingEvent(); global.platform.openTab({ - url: MMI_STAKE_WEBSITE, + url: `${mmiPortfolioUrl}/stake`, }); onClose(); }} @@ -152,7 +154,7 @@ export const SelectActionModal = ({ onClose }) => { onClick={() => { ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) global.platform.openTab({ - url: MMI_SWAPS_URL, + url: `${mmiPortfolioUrl}/swap`, }); ///: END:ONLY_INCLUDE_IN diff --git a/ui/helpers/constants/common.ts b/ui/helpers/constants/common.ts index f59f451660e7..eb1b4946750f 100644 --- a/ui/helpers/constants/common.ts +++ b/ui/helpers/constants/common.ts @@ -7,7 +7,6 @@ const _contractAddressLink = ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) const _mmiWebSite = 'https://metamask.io/institutions/'; export const MMI_WEB_SITE = _mmiWebSite; -export const MMI_STAKE_WEBSITE = 'https://metamask-institutional.io/stake'; ///: END:ONLY_INCLUDE_IN // eslint-disable-next-line prefer-destructuring From e316f95092c1febaa86b8ac836c42fd8bbee9f28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albert=20Oliv=C3=A9?= Date: Thu, 21 Sep 2023 10:39:14 +0200 Subject: [PATCH 005/219] Add Custody component unit tests (#20907) * Initial work * updated tests * Update test * Finished adding tests * prettier * Fixed tests * Changed custodian name to envName and fixed tests * Updated tests * Updated tests --- app/scripts/controllers/mmi-controller.js | 2 +- ui/components/ui/pulse-loader/pulse-loader.js | 2 +- .../institutional/find-by-custodian-name.ts | 2 +- .../confirm-transaction-base.test.js | 2 +- .../confirm-connect-custodian-modal.js | 6 +- .../__snapshots__/custody.test.js.snap | 145 +++--- ui/pages/institutional/custody/custody.js | 176 ++++---- .../institutional/custody/custody.test.js | 411 ++++++++++++++++-- ...active-replacement-token-page.test.js.snap | 1 + ui/selectors/institutional/selectors.js | 4 +- ui/selectors/institutional/selectors.test.js | 14 +- 11 files changed, 552 insertions(+), 213 deletions(-) diff --git a/app/scripts/controllers/mmi-controller.js b/app/scripts/controllers/mmi-controller.js index 355d4ad27352..bdf84c5f8877 100644 --- a/app/scripts/controllers/mmi-controller.js +++ b/app/scripts/controllers/mmi-controller.js @@ -345,7 +345,7 @@ export default class MMIController extends EventEmitter { // FIXME: status maps are not a thing anymore this.custodyController.storeCustodyStatusMap( - custodian.name, + custodian.envName, keyring.getStatusMap(), ); diff --git a/ui/components/ui/pulse-loader/pulse-loader.js b/ui/components/ui/pulse-loader/pulse-loader.js index d4d542d71c16..227a07e49475 100644 --- a/ui/components/ui/pulse-loader/pulse-loader.js +++ b/ui/components/ui/pulse-loader/pulse-loader.js @@ -2,7 +2,7 @@ import React from 'react'; export default function PulseLoader() { return ( -
+
diff --git a/ui/helpers/utils/institutional/find-by-custodian-name.ts b/ui/helpers/utils/institutional/find-by-custodian-name.ts index 52a05b3b7b27..bdd58d0cbcd2 100644 --- a/ui/helpers/utils/institutional/find-by-custodian-name.ts +++ b/ui/helpers/utils/institutional/find-by-custodian-name.ts @@ -24,7 +24,7 @@ export function findCustodianByDisplayName( } for (const custodian of custodians) { - const custodianName = custodian.name.toLowerCase(); + const custodianName = custodian.envName.toLowerCase(); if (formatedDisplayName.includes(custodianName)) { return custodian; diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.test.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.test.js index 678bbf4540f3..882d32dc4dd9 100644 --- a/ui/pages/confirm-transaction-base/confirm-transaction-base.test.js +++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.test.js @@ -228,7 +228,7 @@ describe('Confirm Transaction Base', () => { mockedStore.metamask.mmiConfiguration = { custodians: [ { - name: 'saturn-dev', + envName: 'saturn-dev', displayName: 'Saturn Custody', isNoteToTraderSupported: true, }, diff --git a/ui/pages/institutional/confirm-connect-custodian-modal/confirm-connect-custodian-modal.js b/ui/pages/institutional/confirm-connect-custodian-modal/confirm-connect-custodian-modal.js index b3269b2ad607..d08e07d7fe1a 100644 --- a/ui/pages/institutional/confirm-connect-custodian-modal/confirm-connect-custodian-modal.js +++ b/ui/pages/institutional/confirm-connect-custodian-modal/confirm-connect-custodian-modal.js @@ -10,7 +10,7 @@ import { import { I18nContext } from '../../../contexts/i18n'; import { Button, - BUTTON_VARIANT, + ButtonVariant, Box, Text, Modal, @@ -78,7 +78,7 @@ const ConfirmConnectCustodianModal = ({
-
-`; - -exports[`CustodyPage renders CustodyPage 2`] = ` -
- -
-
- -

- Back -

-
-

- Custodial Accounts -

-
+

- Please choose the custodian you want to connect in order to add or refresh a token. -

-
+
+ +
+
+
+

-

    -
    -
    - Saturn Custody -

    - Saturn Custody -

    -
    - -
    -
-
+ Saturn Custody C +

- +
-
+ `; - -exports[`CustodyPage renders CustodyPage 3`] = `
`; diff --git a/ui/pages/institutional/custody/custody.js b/ui/pages/institutional/custody/custody.js index 70c60f1e214b..094d0a5f6016 100644 --- a/ui/pages/institutional/custody/custody.js +++ b/ui/pages/institutional/custody/custody.js @@ -7,7 +7,6 @@ import React, { } from 'react'; import { useSelector, useDispatch } from 'react-redux'; import { useHistory } from 'react-router-dom'; -import { v4 as uuidv4 } from 'uuid'; import { isEqual } from 'lodash'; import { useI18nContext } from '../../../hooks/useI18nContext'; import { mmiActionsFactory } from '../../../store/institutional/institution-background'; @@ -18,8 +17,8 @@ import { Label, IconName, IconSize, - BUTTON_SIZES, - BUTTON_VARIANT, + ButtonSize, + ButtonVariant, Box, Text, } from '../../../components/component-library'; @@ -55,6 +54,8 @@ import PulseLoader from '../../../components/ui/pulse-loader/pulse-loader'; import ConfirmConnectCustodianModal from '../confirm-connect-custodian-modal'; import { findCustodianByDisplayName } from '../../../helpers/utils/institutional/find-by-custodian-name'; +const GK8_DISPLAY_NAME = 'gk8'; + const CustodyPage = () => { const t = useI18nContext(); const history = useHistory(); @@ -88,26 +89,18 @@ const CustodyPage = () => { const [accounts, setAccounts] = useState(); const address = useSelector(getSelectedAddress); const connectRequest = connectRequests ? connectRequests[0] : undefined; + const isCheckBoxSelected = + accounts && Object.keys(selectedAccounts).length === accounts.length; const custodianButtons = useMemo(() => { const custodianItems = []; - const sortedCustodians = [...custodians].sort(function (a, b) { - const nameA = a.name.toLowerCase(); - const nameB = b.name.toLowerCase(); - - if (nameA < nameB) { - return -1; - } - if (nameA > nameB) { - return 1; - } - return 0; - }); + const sortedCustodians = [...custodians].sort((a, b) => + a.envName.toLowerCase().localeCompare(b.envName.toLowerCase()), + ); function shouldShowInProduction(custodian) { return ( - custodian && 'production' in custodian && !custodian.production && process.env.METAMASK_ENVIRONMENT === 'production' @@ -115,19 +108,59 @@ const CustodyPage = () => { } function isHidden(custodian) { - return custodian && 'hidden' in custodian && custodian.hidden; + return 'hidden' in custodian && custodian.hidden; } function isNotSelectedCustodian(custodian) { return ( - custodian && - 'name' in custodian && + 'envName' in custodian && connectRequest && Object.keys(connectRequest).length && - custodian.name !== selectedCustodianName + custodian.envName !== selectedCustodianName ); } + async function handleButtonClick(custodian) { + try { + const custodianByDisplayName = findCustodianByDisplayName( + custodian.displayName, + custodians, + ); + + const jwtListValue = await dispatch( + mmiActions.getCustodianJWTList(custodian.envName), + ); + + setSelectedCustodianName(custodian.envName); + setSelectedCustodianDisplayName(custodian.displayName); + setSelectedCustodianImage(custodian.iconUrl); + setApiUrl(custodian.apiUrl); + setCurrentJwt(jwtListValue[0] || ''); + setJwtList(jwtListValue); + + // open confirm Connect Custodian modal except for gk8 + if ( + custodianByDisplayName?.displayName?.toLocaleLowerCase() === + GK8_DISPLAY_NAME + ) { + setSelectedCustodianType(custodian.type); + } else { + setMatchedCustodian(custodianByDisplayName); + setIsConfirmConnectCustodianModalVisible(true); + } + + trackEvent({ + category: MetaMetricsEventCategory.MMI, + event: MetaMetricsEventName.CustodianSelected, + properties: { + custodian: custodian.envName, + }, + }); + } catch (error) { + console.error('Error:', error); + } + } + sortedCustodians.forEach((custodian) => { if ( shouldShowInProduction(custodian) || @@ -139,7 +172,7 @@ const CustodyPage = () => { custodianItems.push( { @@ -222,25 +218,27 @@ const CustodyPage = () => { const handleConnectError = useCallback( (e) => { - let errorMessage; - const detailedError = e.message.split(':'); - - if (detailedError.length > 1 && !isNaN(parseInt(detailedError[0], 10))) { - if (parseInt(detailedError[0], 10) === 401) { - // Authentication Error - errorMessage = - 'Authentication error. Please ensure you have entered the correct token'; + const getErrorMessage = (error) => { + const detailedError = error.message.split(':'); + const errorCode = parseInt(detailedError[0], 10); + + if (detailedError.length > 1 && !isNaN(errorCode)) { + switch (errorCode) { + case 401: + return 'Authentication error. Please ensure you have entered the correct token'; + default: + return null; + } } - } - if (/Network Error/u.test(e.message)) { - errorMessage = - 'Network error. Please ensure you have entered the correct API URL'; - } + if (/Network Error/u.test(error.message)) { + return 'Network error. Please ensure you have entered the correct API URL'; + } - if (!errorMessage) { - errorMessage = e.message; - } + return error.message; + }; + + const errorMessage = getErrorMessage(e); setConnectError( `Something went wrong connecting your custodian account. Error details: ${errorMessage}`, @@ -382,7 +380,12 @@ const CustodyPage = () => { return ( {connectError && ( - + {connectError} )} @@ -391,8 +394,10 @@ const CustodyPage = () => { {selectError} )} + {!accounts && !selectedCustodianType && ( { marginTop={4} > { ) : (
+
+
+
+
+ + + + + +
+
+
+
+

+ Custody test +

+

+ 0xca8f...f281 +

+
+
{ it('returns accounts with balance, address, and name from identity and accounts in state', () => { const accountsWithSendEther = selectors.accountsWithSendEtherInfoSelector(mockState); - expect(accountsWithSendEther).toHaveLength(4); + expect(accountsWithSendEther).toHaveLength(5); expect(accountsWithSendEther[0].balance).toStrictEqual( '0x346ba7725f412cbfdb', ); From fcefc0f5c5adf8aa17a687721634fb552013a39d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albert=20Oliv=C3=A9?= Date: Mon, 2 Oct 2023 17:10:45 +0200 Subject: [PATCH 013/219] [MMI] Remove Whats-new-popup mmi code fences (#21146) ## Explanation Remove Whats-new-popup mmi code fences. Currently, those code fences are doing nothing, and we don't have any plans yet to add custom mmi popups. ## Pre-merge author checklist - [x] I've clearly explained: - [x] What problem this PR is solving - [x] How this problem was solved - [x] How reviewers can test my changes - [x] Sufficient automated test coverage has been added ## Pre-merge reviewer checklist - [x] Manual testing (e.g. pull and build branch, run in browser, test code being changed) - [x] **IF** this PR fixes a bug in the release milestone, add this PR to the release milestone If further QA is required (e.g. new feature, complex testing steps, large refactor), add the `Extension QA Board` label. In this case, a QA Engineer approval will be be required. --- .../app/whats-new-popup/whats-new-popup.js | 113 ++---------------- ui/pages/home/home.component.js | 12 +- 2 files changed, 11 insertions(+), 114 deletions(-) diff --git a/ui/components/app/whats-new-popup/whats-new-popup.js b/ui/components/app/whats-new-popup/whats-new-popup.js index 8c868e401588..3b1b18dd1b28 100644 --- a/ui/components/app/whats-new-popup/whats-new-popup.js +++ b/ui/components/app/whats-new-popup/whats-new-popup.js @@ -8,13 +8,7 @@ import { getCurrentLocale } from '../../../ducks/locale/locale'; import { I18nContext } from '../../../contexts/i18n'; import { useEqualityCheck } from '../../../hooks/useEqualityCheck'; import Popover from '../../ui/popover'; -import { - Text, - ButtonPrimary, - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - IconName, - ///: END:ONLY_INCLUDE_IN -} from '../../component-library'; +import { Text, ButtonPrimary } from '../../component-library'; import { updateViewedNotifications } from '../../../store/actions'; import { NOTIFICATION_BUY_SELL_BUTTON, @@ -30,12 +24,7 @@ import { EXPERIMENTAL_ROUTE, SECURITY_ROUTE, } from '../../../helpers/constants/routes'; -import { - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - Size, - ///: END:ONLY_INCLUDE_IN - TextVariant, -} from '../../../helpers/constants/design-system'; +import { TextVariant } from '../../../helpers/constants/design-system'; import ZENDESK_URLS from '../../../helpers/constants/zendesk-url'; import { MetaMetricsContext } from '../../../contexts/metametrics'; import { @@ -167,30 +156,9 @@ const renderFirstNotification = ({ history, isLast, trackEvent, - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - mmiPortfolioUrl, - seenNotifications, - onClose, - ///: END:ONLY_INCLUDE_IN }) => { - const { - id, - date, - title, - description, - image, - actionText, - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - customButton, - hideDate, - ///: END:ONLY_INCLUDE_IN - } = notification; + const { id, date, title, description, image, actionText } = notification; const actionFunction = getActionFunctionById(id, history); - let showNotificationDate = true; - - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - showNotificationDate = !hideDate; - ///: END:ONLY_INCLUDE_IN const imageComponent = image && ( ); const placeImageBelowDescription = image?.placeImageBelowDescription; + return (
{renderDescription(description)}
- {showNotificationDate && ( -
{date}
- )} + +
{date}
{placeImageBelowDescription && imageComponent} {actionText && ( @@ -239,26 +207,6 @@ const renderFirstNotification = ({ {actionText} )} - { - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - customButton && customButton.name === 'mmi-portfolio' && ( - { - updateViewedNotifications(seenNotifications); - onClose(); - window.open(mmiPortfolioUrl, '_blank'); - }} - block - > - {customButton.text} - - ) - ///: END:ONLY_INCLUDE_IN - }
{ const observer = new window.IntersectionObserver( (entries, _observer) => { @@ -381,26 +325,10 @@ export default function WhatsNewPopup({ observer.observe(ref.current); }); - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - trackEvent({ - category: MetaMetricsEventCategory.MMI, - event: MetaMetricsEventName.MMIPortfolioDashboardModalOpen, - properties: { - action: 'Modal was opened', - }, - }); - ///: END:ONLY_INCLUDE_IN - return () => { observer.disconnect(); }; - }, [ - idRefMap, - setSeenNotifications, - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - trackEvent, - ///: END:ONLY_INCLUDE_IN - ]); + }, [idRefMap, setSeenNotifications]); // Display the swaps notification with full image // Displays the NFTs & OpenSea notifications 18,19 with full image @@ -436,15 +364,6 @@ export default function WhatsNewPopup({ completed_all: true, }, }); - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - trackEvent({ - category: MetaMetricsEventCategory.MMI, - event: MetaMetricsEventName.MMIPortfolioDashboardModalButton, - properties: { - action: 'Button was clicked', - }, - }); - ///: END:ONLY_INCLUDE_IN onClose(); }} popoverRef={popoverRef} @@ -457,24 +376,15 @@ export default function WhatsNewPopup({ const notification = getTranslatedUINotifications(t, locale)[id]; const isLast = index === notifications.length - 1; // Choose the appropriate rendering function based on the id - let renderNotification = + const renderNotification = notificationRenderers[id] || renderSubsequentNotification; - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - renderNotification = renderFirstNotification; - ///: END:ONLY_INCLUDE_IN - return renderNotification({ notification, idRefMap, history, isLast, trackEvent, - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - mmiPortfolioUrl, - seenNotifications, - onClose, - ///: END:ONLY_INCLUDE_IN }); })}
@@ -484,7 +394,4 @@ export default function WhatsNewPopup({ WhatsNewPopup.propTypes = { onClose: PropTypes.func.isRequired, - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - mmiPortfolioUrl: PropTypes.string.isRequired, - ///: END:ONLY_INCLUDE_IN }; diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js index efa0acaeca70..85708fa9eceb 100644 --- a/ui/pages/home/home.component.js +++ b/ui/pages/home/home.component.js @@ -193,7 +193,6 @@ export default class Home extends PureComponent { ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) institutionalConnectRequests: PropTypes.arrayOf(PropTypes.object), mmiPortfolioEnabled: PropTypes.bool, - mmiPortfolioUrl: PropTypes.string, modalOpen: PropTypes.bool, setWaitForConfirmDeepLinkDialog: PropTypes.func, waitForConfirmDeepLinkDialog: PropTypes.bool, @@ -772,7 +771,6 @@ export default class Home extends PureComponent { newNetworkAddedConfigurationId, ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) mmiPortfolioEnabled, - mmiPortfolioUrl, ///: END:ONLY_INCLUDE_IN } = this.props; @@ -822,14 +820,7 @@ export default class Home extends PureComponent { exact />
- {showWhatsNew ? ( - - ) : null} + {showWhatsNew ? : null} { ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-flask) } @@ -861,7 +852,6 @@ export default class Home extends PureComponent { ///: END:ONLY_INCLUDE_IN } From 87d410a29b168746f363fe430615bc140dbb0bb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albert=20Oliv=C3=A9?= Date: Mon, 2 Oct 2023 17:21:42 +0200 Subject: [PATCH 014/219] =?UTF-8?q?[MMI]=C2=A0Add=20Confirm-approve-conten?= =?UTF-8?q?t.component=20unit=20test=20(#21148)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Explanation Add Confirm-approve-content.component unit test ## Pre-merge author checklist - [x] I've clearly explained: - [x] What problem this PR is solving - [x] How this problem was solved - [x] How reviewers can test my changes - [x] Sufficient automated test coverage has been added ## Pre-merge reviewer checklist - [x] Manual testing (e.g. pull and build branch, run in browser, test code being changed) - [x] **IF** this PR fixes a bug in the release milestone, add this PR to the release milestone If further QA is required (e.g. new feature, complex testing steps, large refactor), add the `Extension QA Board` label. In this case, a QA Engineer approval will be be required. --- .../confirm-approve-content.component.test.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js index 20d27f86e00a..5f66cfd5d87c 100644 --- a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js +++ b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js @@ -361,4 +361,19 @@ describe('ConfirmApproveContent Component', () => { expect(getByText('This is a deceptive request')).toBeInTheDocument(); }); + + it('should render token contract address when isSetApproveForAll and isApprovalOrRejection are true', () => { + const { getByText } = renderComponent({ + ...props, + isSetApproveForAll: true, + isApprovalOrRejection: true, + tokenAddress: '0x', + }); + + const showViewTxDetails = getByText('View full transaction details'); + + fireEvent.click(showViewTxDetails); + + expect(getByText(/Token contract address: 0x/u)).toBeInTheDocument(); + }); }); From 4468168332c26041622e04f21d08bb0d8e7a60fc Mon Sep 17 00:00:00 2001 From: David Walsh Date: Mon, 2 Oct 2023 10:42:43 -0500 Subject: [PATCH 015/219] UX: Multichain: Add Account or Hardware Wallet button (#21081) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** Replaces the "Add / Import / Hardware" links with a single button that takes the user to another quick modal to add, import, or connect a hardware wallet. ## **Manual testing steps** _1. Open the account menu _2. Click the "Add account or hardware wallet" button _3. Click each option, ensure the correct modal displays _4. Click "back" on each screen, ensure it goes back logically in the nested cycle ## **Screenshots/Recordings** https://github.com/MetaMask/metamask-extension/assets/46655/7967d0ce-870c-4ccb-91bc-3f2e9cf55e79 ## **Related issues** _Fixes https://github.com/MetaMask/MetaMask-planning/issues/1374 ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've clearly explained: - [ ] What problem this PR is solving. - [ ] How this problem was solved. - [ ] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- app/_locales/en/messages.json | 6 + test/e2e/tests/account-details.spec.js | 6 + test/e2e/tests/add-account.spec.js | 14 +- test/e2e/tests/import-flow.spec.js | 20 +- test/e2e/user-actions-benchmark.js | 3 + .../account-list-menu/account-list-menu.js | 306 ++++++++++-------- .../account-list-menu.test.js | 115 +++++-- 7 files changed, 306 insertions(+), 164 deletions(-) diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 8d3c090ca1c5..dd67a4b6d1ed 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -246,6 +246,9 @@ "addIPFSGateway": { "message": "Add your preferred IPFS gateway" }, + "addImportAccount": { + "message": "Add account or hardware wallet" + }, "addMemo": { "message": "Add memo" }, @@ -259,6 +262,9 @@ "message": "This network connection relies on third parties. This connection may be less reliable or enable third-parties to track activity. $1", "description": "$1 is Learn more link" }, + "addNewAccount": { + "message": "Add a new account" + }, "addNewToken": { "message": "Add new token" }, diff --git a/test/e2e/tests/account-details.spec.js b/test/e2e/tests/account-details.spec.js index eeee82694f54..b6601fb51b5c 100644 --- a/test/e2e/tests/account-details.spec.js +++ b/test/e2e/tests/account-details.spec.js @@ -105,6 +105,9 @@ describe('Show account details', function () { // Create and focus on different account await driver.clickElement('[data-testid="account-menu-icon"]'); + await driver.clickElement( + '[data-testid="multichain-account-menu-popover-action-button"]', + ); await driver.clickElement( '[data-testid="multichain-account-menu-popover-add-account"]', ); @@ -153,6 +156,9 @@ describe('Show account details', function () { // Create and focus on different account await driver.clickElement('[data-testid="account-menu-icon"]'); + await driver.clickElement( + '[data-testid="multichain-account-menu-popover-action-button"]', + ); await driver.clickElement( '[data-testid="multichain-account-menu-popover-add-account"]', ); diff --git a/test/e2e/tests/add-account.spec.js b/test/e2e/tests/add-account.spec.js index b44fbad027d6..5b2551b86294 100644 --- a/test/e2e/tests/add-account.spec.js +++ b/test/e2e/tests/add-account.spec.js @@ -41,6 +41,9 @@ describe('Add account', function () { await unlockWallet(driver); await driver.clickElement('[data-testid="account-menu-icon"]'); + await driver.clickElement( + '[data-testid="multichain-account-menu-popover-action-button"]', + ); await driver.clickElement( '[data-testid="multichain-account-menu-popover-add-account"]', ); @@ -82,6 +85,9 @@ describe('Add account', function () { // Create 2nd account await driver.clickElement('[data-testid="account-menu-icon"]'); + await driver.clickElement( + '[data-testid="multichain-account-menu-popover-action-button"]', + ); await driver.clickElement( '[data-testid="multichain-account-menu-popover-add-account"]', ); @@ -176,7 +182,9 @@ describe('Add account', function () { await unlockWallet(driver); await driver.clickElement('[data-testid="account-menu-icon"]'); - + await driver.clickElement( + '[data-testid="multichain-account-menu-popover-action-button"]', + ); await driver.clickElement( '[data-testid="multichain-account-menu-popover-add-account"]', ); @@ -191,7 +199,6 @@ describe('Add account', function () { }); await driver.clickElement('[data-testid="account-menu-icon"]'); - const menuItems = await driver.findElements( '.multichain-account-list-item', ); @@ -207,6 +214,9 @@ describe('Add account', function () { // Create 3rd account with private key await driver.clickElement('.mm-text-field'); + await driver.clickElement( + '[data-testid="multichain-account-menu-popover-action-button"]', + ); await driver.clickElement({ text: 'Import account', tag: 'button' }); await driver.fill('#private-key-box', testPrivateKey); diff --git a/test/e2e/tests/import-flow.spec.js b/test/e2e/tests/import-flow.spec.js index 23f51ec87f50..e92c8ffc2542 100644 --- a/test/e2e/tests/import-flow.spec.js +++ b/test/e2e/tests/import-flow.spec.js @@ -83,7 +83,10 @@ describe('Import flow', function () { // choose Create account from the account menu await driver.clickElement('[data-testid="account-menu-icon"]'); - await driver.clickElement({ text: 'Add account', tag: 'button' }); + await driver.clickElement( + '[data-testid="multichain-account-menu-popover-action-button"]', + ); + await driver.clickElement({ text: 'Add a new account', tag: 'button' }); // set account name await driver.fill('[placeholder="Account 2"]', '2nd account'); @@ -196,6 +199,9 @@ describe('Import flow', function () { await driver.press('#password', driver.Key.ENTER); await driver.clickElement('[data-testid="account-menu-icon"]'); + await driver.clickElement( + '[data-testid="multichain-account-menu-popover-action-button"]', + ); await driver.clickElement({ text: 'Import account', tag: 'button' }); // Imports Account 4 with private key @@ -222,6 +228,9 @@ describe('Import flow', function () { }); // Imports Account 5 with private key + await driver.clickElement( + '[data-testid="multichain-account-menu-popover-action-button"]', + ); await driver.clickElement({ text: 'Import account', tag: 'button' }); await driver.findClickableElement('#private-key-box'); await driver.fill('#private-key-box', testPrivateKey2); @@ -277,6 +286,9 @@ describe('Import flow', function () { // Imports an account with JSON file await driver.clickElement('[data-testid="account-menu-icon"]'); + await driver.clickElement( + '[data-testid="multichain-account-menu-popover-action-button"]', + ); await driver.clickElement({ text: 'Import account', tag: 'button' }); await driver.clickElement('.dropdown__select'); @@ -340,6 +352,9 @@ describe('Import flow', function () { // choose Import Account from the account menu await driver.clickElement('[data-testid="account-menu-icon"]'); + await driver.clickElement( + '[data-testid="multichain-account-menu-popover-action-button"]', + ); await driver.clickElement({ text: 'Import account', tag: 'button' }); // enter private key @@ -373,6 +388,9 @@ describe('Import flow', function () { // choose Connect hardware wallet from the account menu await driver.clickElement('[data-testid="account-menu-icon"]'); + await driver.clickElement( + '[data-testid="multichain-account-menu-popover-action-button"]', + ); await driver.clickElement({ text: 'Add hardware wallet', tag: 'button', diff --git a/test/e2e/user-actions-benchmark.js b/test/e2e/user-actions-benchmark.js index 07843ecdf32f..3c2d71045a68 100644 --- a/test/e2e/user-actions-benchmark.js +++ b/test/e2e/user-actions-benchmark.js @@ -34,6 +34,9 @@ async function loadNewAccount() { await driver.press('#password', driver.Key.ENTER); await driver.clickElement('[data-testid="account-menu-icon"]'); + await driver.clickElement( + '[data-testid="multichain-account-menu-popover-action-button"]', + ); const timestampBeforeAction = new Date(); await driver.clickElement( '[data-testid="multichain-account-menu-popover-add-account"]', diff --git a/ui/components/multichain/account-list-menu/account-list-menu.js b/ui/components/multichain/account-list-menu/account-list-menu.js index a51ba2e0d612..3edbe481063f 100644 --- a/ui/components/multichain/account-list-menu/account-list-menu.js +++ b/ui/components/multichain/account-list-menu/account-list-menu.js @@ -5,7 +5,6 @@ import Fuse from 'fuse.js'; import { useDispatch, useSelector } from 'react-redux'; import { IconName, - ButtonLink, TextFieldSearch, Box, Modal, @@ -13,6 +12,10 @@ import { ModalOverlay, ModalHeader, Text, + ButtonVariant, + ButtonLink, + ButtonSecondary, + ButtonSecondarySize, } from '../../component-library'; import { AccountListItem, CreateAccount, ImportAccount } from '..'; import { @@ -21,6 +24,7 @@ import { TextColor, Display, FlexDirection, + AlignItems, } from '../../../helpers/constants/design-system'; import { useI18nContext } from '../../../hooks/useI18nContext'; import { MetaMetricsContext } from '../../../contexts/metametrics'; @@ -51,6 +55,17 @@ import { import { getEnvironmentType } from '../../../../app/scripts/lib/util'; import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app'; +const ACTION_MODES = { + // Displays the search box and account list + LIST: '', + // Displays the Add, Import, Hardware accounts + MENU: 'menu', + // Displays the add account form controls + ADD: 'add', + // Displays the import account form controls + IMPORT: 'import', +}; + export const AccountListMenu = ({ onClose }) => { const t = useI18nContext(); const trackEvent = useContext(MetaMetricsContext); @@ -65,7 +80,7 @@ export const AccountListMenu = ({ onClose }) => { ///: END:ONLY_INCLUDE_IN const [searchQuery, setSearchQuery] = useState(''); - const [actionMode, setActionMode] = useState(''); + const [actionMode, setActionMode] = useState(ACTION_MODES.LIST); let searchResults = accounts; if (searchQuery) { @@ -82,12 +97,21 @@ export const AccountListMenu = ({ onClose }) => { } let title = t('selectAnAccount'); - if (actionMode === 'add') { + if (actionMode === ACTION_MODES.ADD || actionMode === ACTION_MODES.MENU) { title = t('addAccount'); - } else if (actionMode === 'import') { + } else if (actionMode === ACTION_MODES.IMPORT) { title = t('importAccount'); } + let onBack = null; + if (actionMode !== ACTION_MODES.LIST) { + if (actionMode === ACTION_MODES.MENU) { + onBack = () => setActionMode(ACTION_MODES.LIST); + } else { + onBack = () => setActionMode(ACTION_MODES.MENU); + } + } + return ( @@ -100,27 +124,23 @@ export const AccountListMenu = ({ onClose }) => { flexDirection: FlexDirection.Column, }} > - setActionMode('')} - > + {title} - {actionMode === 'add' ? ( + {actionMode === ACTION_MODES.ADD ? ( { if (confirmed) { dispatch(toggleAccountMenu()); } else { - setActionMode(''); + setActionMode(ACTION_MODES.LIST); } }} /> ) : null} - {actionMode === 'import' ? ( + {actionMode === ACTION_MODES.IMPORT ? ( { if (confirmed) { dispatch(toggleAccountMenu()); } else { - setActionMode(''); + setActionMode(ACTION_MODES.LIST); } }} /> ) : null} - {actionMode === '' ? ( + {/* Add / Import / Hardware Menu */} + {actionMode === ACTION_MODES.MENU ? ( + + + { + trackEvent({ + category: MetaMetricsEventCategory.Navigation, + event: MetaMetricsEventName.AccountAddSelected, + properties: { + account_type: MetaMetricsEventAccountType.Default, + location: 'Main Menu', + }, + }); + setActionMode(ACTION_MODES.ADD); + }} + data-testid="multichain-account-menu-popover-add-account" + > + {t('addNewAccount')} + + + + { + trackEvent({ + category: MetaMetricsEventCategory.Navigation, + event: MetaMetricsEventName.AccountAddSelected, + properties: { + account_type: MetaMetricsEventAccountType.Imported, + location: 'Main Menu', + }, + }); + setActionMode(ACTION_MODES.IMPORT); + }} + > + {t('importAccount')} + + + + { + dispatch(toggleAccountMenu()); + trackEvent({ + category: MetaMetricsEventCategory.Navigation, + event: MetaMetricsEventName.AccountAddSelected, + properties: { + account_type: MetaMetricsEventAccountType.Hardware, + location: 'Main Menu', + }, + }); + if (getEnvironmentType() === ENVIRONMENT_TYPE_POPUP) { + global.platform.openExtensionInBrowser( + CONNECT_HARDWARE_ROUTE, + ); + } else { + history.push(CONNECT_HARDWARE_ROUTE); + } + }} + > + {t('addHardwareWallet')} + + + { + ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) + addSnapAccountEnabled ? ( + + { + dispatch(toggleAccountMenu()); + getEnvironmentType() === ENVIRONMENT_TYPE_POPUP + ? global.platform.openExtensionInBrowser( + ADD_SNAP_ACCOUNT_ROUTE, + null, + true, + ) + : history.push(ADD_SNAP_ACCOUNT_ROUTE); + }} + > + {t('settingAddSnapAccount')} + + + ) : null + ///: END:ONLY_INCLUDE_IN + } + { + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + + { + dispatch(toggleAccountMenu()); + trackEvent({ + category: MetaMetricsEventCategory.Navigation, + event: + MetaMetricsEventName.ConnectCustodialAccountClicked, + }); + if (getEnvironmentType() === ENVIRONMENT_TYPE_POPUP) { + global.platform.openExtensionInBrowser( + CUSTODY_ACCOUNT_ROUTE, + ); + } else { + history.push(CUSTODY_ACCOUNT_ROUTE); + } + }} + > + {t('connectCustodialAccountMenu')} + + + ///: END:ONLY_INCLUDE_IN + } + + ) : null} + {actionMode === ACTION_MODES.LIST ? ( <> {/* Search box */} {accounts.length > 1 ? ( @@ -202,124 +343,25 @@ export const AccountListMenu = ({ onClose }) => { ); })} - {/* Add / Import / Hardware */} - - - { - trackEvent({ - category: MetaMetricsEventCategory.Navigation, - event: MetaMetricsEventName.AccountAddSelected, - properties: { - account_type: MetaMetricsEventAccountType.Default, - location: 'Main Menu', - }, - }); - setActionMode('add'); - }} - data-testid="multichain-account-menu-popover-add-account" - > - {t('addAccount')} - - - - { - trackEvent({ - category: MetaMetricsEventCategory.Navigation, - event: MetaMetricsEventName.AccountAddSelected, - properties: { - account_type: MetaMetricsEventAccountType.Imported, - location: 'Main Menu', - }, - }); - setActionMode('import'); - }} - > - {t('importAccount')} - - - - { - dispatch(toggleAccountMenu()); - trackEvent({ - category: MetaMetricsEventCategory.Navigation, - event: MetaMetricsEventName.AccountAddSelected, - properties: { - account_type: MetaMetricsEventAccountType.Hardware, - location: 'Main Menu', - }, - }); - if (getEnvironmentType() === ENVIRONMENT_TYPE_POPUP) { - global.platform.openExtensionInBrowser( - CONNECT_HARDWARE_ROUTE, - ); - } else { - history.push(CONNECT_HARDWARE_ROUTE); - } - }} - > - {t('addHardwareWallet')} - - - { - ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) - addSnapAccountEnabled && ( - - { - dispatch(toggleAccountMenu()); - getEnvironmentType() === ENVIRONMENT_TYPE_POPUP - ? global.platform.openExtensionInBrowser( - ADD_SNAP_ACCOUNT_ROUTE, - null, - true, - ) - : history.push(ADD_SNAP_ACCOUNT_ROUTE); - }} - > - {t('settingAddSnapAccount')} - - - ) - ///: END:ONLY_INCLUDE_IN - } - { - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - - { - dispatch(toggleAccountMenu()); - trackEvent({ - category: MetaMetricsEventCategory.Navigation, - event: - MetaMetricsEventName.ConnectCustodialAccountClicked, - }); - if (getEnvironmentType() === ENVIRONMENT_TYPE_POPUP) { - global.platform.openExtensionInBrowser( - CUSTODY_ACCOUNT_ROUTE, - ); - } else { - history.push(CUSTODY_ACCOUNT_ROUTE); - } - }} - > - {t('connectCustodialAccountMenu')} - - - ///: END:ONLY_INCLUDE_IN - } + {/* Add / Import / Hardware button */} + + setActionMode(ACTION_MODES.MENU)} + data-testid="multichain-account-menu-popover-action-button" + > + {t('addImportAccount')} + ) : null} diff --git a/ui/components/multichain/account-list-menu/account-list-menu.test.js b/ui/components/multichain/account-list-menu/account-list-menu.test.js index ebdc008732db..3ea7532f404a 100644 --- a/ui/components/multichain/account-list-menu/account-list-menu.test.js +++ b/ui/components/multichain/account-list-menu/account-list-menu.test.js @@ -58,35 +58,7 @@ describe('AccountListMenu', () => { const { getByPlaceholderText, getByText } = render(); expect(getByPlaceholderText('Search accounts')).toBeInTheDocument(); - expect(getByText('Add account')).toBeInTheDocument(); - expect(getByText('Import account')).toBeInTheDocument(); - expect(getByText('Add hardware wallet')).toBeInTheDocument(); - }); - - it('shows the account creation UI when Add Account is clicked', () => { - const { getByText, getByPlaceholderText } = render(); - fireEvent.click(getByText('Add account')); - expect(getByText('Create')).toBeInTheDocument(); - expect(getByText('Cancel')).toBeInTheDocument(); - - fireEvent.click(getByText('Cancel')); - expect(getByPlaceholderText('Search accounts')).toBeInTheDocument(); - }); - - it('shows the account import UI when Import Account is clicked', () => { - const { getByText, getByPlaceholderText } = render(); - fireEvent.click(getByText('Import account')); - expect(getByText('Import')).toBeInTheDocument(); - expect(getByText('Cancel')).toBeInTheDocument(); - - fireEvent.click(getByText('Cancel')); - expect(getByPlaceholderText('Search accounts')).toBeInTheDocument(); - }); - - it('navigates to hardware wallet connection screen when clicked', () => { - const { getByText } = render(); - fireEvent.click(getByText('Add hardware wallet')); - expect(historyPushMock).toHaveBeenCalledWith(CONNECT_HARDWARE_ROUTE); + expect(getByText('Add account or hardware wallet')).toBeInTheDocument(); }); it('displays accounts for list and filters by search', () => { @@ -157,6 +129,77 @@ describe('AccountListMenu', () => { expect(searchBox).toBeInTheDocument(); }); + it('add / Import / Hardware button functions as it should', () => { + const { getByText } = render(); + + // Ensure the button is displaying + const button = document.querySelectorAll( + '[data-testid="multichain-account-menu-popover-action-button"]', + ); + expect(button).toHaveLength(1); + + // Click the button to ensure the options and close button display + button[0].click(); + expect(getByText('Add a new account')).toBeInTheDocument(); + expect(getByText('Import account')).toBeInTheDocument(); + expect(getByText('Add hardware wallet')).toBeInTheDocument(); + const header = document.querySelector('header'); + expect(header.innerHTML).toBe('Add account'); + expect( + document.querySelector('button[aria-label="Close"]'), + ).toBeInTheDocument(); + + const backButton = document.querySelector('button[aria-label="Back"]'); + expect(backButton).toBeInTheDocument(); + backButton.click(); + + expect(getByText('Select an account')).toBeInTheDocument(); + }); + + it('shows the account creation UI when Add Account is clicked', () => { + const { getByText, getByPlaceholderText } = render(); + + const button = document.querySelector( + '[data-testid="multichain-account-menu-popover-action-button"]', + ); + button.click(); + + fireEvent.click(getByText('Add a new account')); + expect(getByText('Create')).toBeInTheDocument(); + expect(getByText('Cancel')).toBeInTheDocument(); + + fireEvent.click(getByText('Cancel')); + expect(getByPlaceholderText('Search accounts')).toBeInTheDocument(); + }); + + it('shows the account import UI when Import Account is clicked', () => { + const { getByText, getByPlaceholderText } = render(); + + const button = document.querySelector( + '[data-testid="multichain-account-menu-popover-action-button"]', + ); + button.click(); + + fireEvent.click(getByText('Import account')); + expect(getByText('Import')).toBeInTheDocument(); + expect(getByText('Cancel')).toBeInTheDocument(); + + fireEvent.click(getByText('Cancel')); + expect(getByPlaceholderText('Search accounts')).toBeInTheDocument(); + }); + + it('navigates to hardware wallet connection screen when clicked', () => { + const { getByText } = render(); + + const button = document.querySelector( + '[data-testid="multichain-account-menu-popover-action-button"]', + ); + button.click(); + + fireEvent.click(getByText('Add hardware wallet')); + expect(historyPushMock).toHaveBeenCalledWith(CONNECT_HARDWARE_ROUTE); + }); + ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) describe('addSnapAccountButton', () => { const renderWithState = (state, props = { onClose: () => jest.fn() }) => { @@ -181,6 +224,10 @@ describe('AccountListMenu', () => { it("doesn't render the add snap account button if it's disabled", async () => { const { getByText } = renderWithState({ addSnapAccountEnabled: false }); + const button = document.querySelector( + '[data-testid="multichain-account-menu-popover-action-button"]', + ); + button.click(); expect(() => getByText(messages.settingAddSnapAccount.message)).toThrow( `Unable to find an element with the text: ${messages.settingAddSnapAccount.message}`, ); @@ -188,6 +235,10 @@ describe('AccountListMenu', () => { it("renders the add snap account button if it's enabled", async () => { const { getByText } = renderWithState({ addSnapAccountEnabled: true }); + const button = document.querySelector( + '[data-testid="multichain-account-menu-popover-action-button"]', + ); + button.click(); const addSnapAccountButton = getByText( messages.settingAddSnapAccount.message, ); @@ -202,6 +253,12 @@ describe('AccountListMenu', () => { it('pushes history when clicking add snap account from extended view', async () => { const { getByText } = renderWithState({ addSnapAccountEnabled: true }); mockGetEnvironmentType.mockReturnValueOnce('fullscreen'); + + const button = document.querySelector( + '[data-testid="multichain-account-menu-popover-action-button"]', + ); + button.click(); + const addSnapAccountButton = getByText( messages.settingAddSnapAccount.message, ); From 0c6ebd6fdd1e42b302420c76fe3b5663e12ee5b2 Mon Sep 17 00:00:00 2001 From: David Walsh Date: Mon, 2 Oct 2023 10:42:57 -0500 Subject: [PATCH 016/219] Fix #19371 - Provide conversion buttons for empty accounts (#21049) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** Provides conversion buttons to buy, receive, and learn more about NFTs when an account is empty. ## **Manual testing steps** - Start with a MetaMask account with assets in it on Mainnet - *Don't* see the Buy/Receive blocks - Create a new account with no assets - *See* the Buy/Receive blocks - Switch to a network that we don't support buying on (localhost) - See *only* the "Receive" block - Switch to NFTs tab - See the NFTs block if you have no NFTS - *Don't* see the NFTs block if you *do* have NFTs ## **Screenshots/Recordings** ### Token List SCR-20230928-qwwf ### NFTs SCR-20230928-qxau ## **Related issues** _Fixes https://github.com/MetaMask/metamask-extension/issues/19371 ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've clearly explained: - [ ] What problem this PR is solving. - [ ] How this problem was solved. - [ ] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- app/_locales/en/messages.json | 3 + app/images/token-list-buy-background.png | Bin 0 -> 3148 bytes app/images/token-list-nfts-background.png | Bin 0 -> 4011 bytes app/images/token-list-receive-background.png | Bin 0 -> 3449 bytes .../__snapshots__/asset-list.test.js.snap | 2 +- .../asset-list/asset-list.buy-receive.test.js | 64 +++++++++ ui/components/app/asset-list/asset-list.js | 132 ++++++++++++++---- .../app/asset-list/asset-list.test.js | 24 ++-- ui/components/app/nfts-tab/nfts-tab.js | 24 +++- ui/components/app/nfts-tab/nfts-tab.test.js | 22 +++ .../asset-list-conversion-button.js | 82 +++++++++++ .../asset-list-conversion-button.scss | 20 +++ .../asset-list-conversion-button.stories.js | 25 ++++ .../asset-list-conversion-button/index.js | 1 + ui/components/multichain/index.js | 1 + .../multichain/multichain-components.scss | 1 + .../multichain/receive-modal/index.js | 1 + .../multichain/receive-modal/receive-modal.js | 79 +++++++++++ .../receive-modal/receive-modal.stories.js | 33 +++++ .../receive-modal/receive-modal.test.js | 27 ++++ 20 files changed, 500 insertions(+), 41 deletions(-) create mode 100644 app/images/token-list-buy-background.png create mode 100644 app/images/token-list-nfts-background.png create mode 100644 app/images/token-list-receive-background.png create mode 100644 ui/components/app/asset-list/asset-list.buy-receive.test.js create mode 100644 ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.js create mode 100644 ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.scss create mode 100644 ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.stories.js create mode 100644 ui/components/multichain/asset-list-conversion-button/index.js create mode 100644 ui/components/multichain/receive-modal/index.js create mode 100644 ui/components/multichain/receive-modal/receive-modal.js create mode 100644 ui/components/multichain/receive-modal/receive-modal.stories.js create mode 100644 ui/components/multichain/receive-modal/receive-modal.test.js diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index dd67a4b6d1ed..f278ae748bf4 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -2606,6 +2606,9 @@ "nftDisclaimer": { "message": "Disclaimer: MetaMask pulls the media file from the source url. This url sometimes is changed by the marketplace the NFT was minted on." }, + "nftLearnMore": { + "message": "Learn more about NFTs" + }, "nftOptions": { "message": "NFT Options" }, diff --git a/app/images/token-list-buy-background.png b/app/images/token-list-buy-background.png new file mode 100644 index 0000000000000000000000000000000000000000..65566931639729d9b676646f47a41d74fd9d9c99 GIT binary patch literal 3148 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 literal 0 HcmV?d00001 diff --git a/app/images/token-list-receive-background.png b/app/images/token-list-receive-background.png new file mode 100644 index 0000000000000000000000000000000000000000..70f0944fc7e0ff19db57865009e2d816a0f79cac GIT binary patch literal 3449 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 bg9N?
{ + const state = { + ...mockState, + metamask: { + ...mockState.metamask, + providerConfig: { chainId }, + cachedBalances: { + [CHAIN_IDS.MAINNET]: { + [selectedAddress]: balance, + }, + }, + selectedAddress, + }, + }; + const store = configureStore(state); + return renderWithProvider( + undefined} />, + store, + ); +}; + +describe('AssetList Buy/Receive', () => { + it('shows Buy and Receive when the account is empty', () => { + process.env.MULTICHAIN = 1; + const { queryByText } = render( + '0xc42edfcc21ed14dda456aa0756c153f7985d8813', + '0x0', + ); + expect(queryByText('Buy')).toBeInTheDocument(); + expect(queryByText('Receive')).toBeInTheDocument(); + }); + + it('shows only Receive when chainId is not buyable', () => { + process.env.MULTICHAIN = 1; + const { queryByText } = render( + '0xc42edfcc21ed14dda456aa0756c153f7985d8813', + '0x0', + '0x8675309', // Custom chain ID that isn't buyable + ); + expect(queryByText('Buy')).not.toBeInTheDocument(); + expect(queryByText('Receive')).toBeInTheDocument(); + }); + + it('shows neither when the account has a balance', () => { + process.env.MULTICHAIN = 1; + const { queryByText } = render(); + expect(queryByText('Buy')).not.toBeInTheDocument(); + expect(queryByText('Receive')).not.toBeInTheDocument(); + }); +}); diff --git a/ui/components/app/asset-list/asset-list.js b/ui/components/app/asset-list/asset-list.js index 48d82ee037b5..259579e380cc 100644 --- a/ui/components/app/asset-list/asset-list.js +++ b/ui/components/app/asset-list/asset-list.js @@ -14,6 +14,10 @@ import { getShouldHideZeroBalanceTokens, getTokenExchangeRates, getCurrentCurrency, + getIsBuyableChain, + getCurrentChainId, + getSwapsDefaultToken, + getSelectedAddress, } from '../../../selectors'; import { getConversionRate, @@ -33,7 +37,9 @@ import { TokenListItem, ImportTokenLink, BalanceOverview, + AssetListConversionButton, } from '../../multichain'; + import { isEqualCaseInsensitive } from '../../../../shared/modules/string-utils'; import { getTokenFiatAmount } from '../../../helpers/utils/token-util'; import { formatCurrency } from '../../../helpers/utils/confirm-tx.util'; @@ -43,15 +49,22 @@ import { } from '../../../../shared/modules/conversion.utils'; import { useTokenTracker } from '../../../hooks/useTokenTracker'; +import useRamps from '../../../hooks/experiences/useRamps'; +import { Display } from '../../../helpers/constants/design-system'; + +import { ReceiveModal } from '../../multichain/receive-modal'; + const AssetList = ({ onClickAsset }) => { const [showDetectedTokens, setShowDetectedTokens] = useState(false); - const selectedAccountBalance = useSelector(getSelectedAccountCachedBalance); const nativeCurrency = useSelector(getNativeCurrency); const showFiat = useSelector(getShouldShowFiat); const trackEvent = useContext(MetaMetricsContext); const balance = useSelector(getSelectedAccountCachedBalance); const balanceIsLoading = !balance; + const selectedAddress = useSelector(getSelectedAddress); + + const [showReceiveModal, setShowReceiveModal] = useState(false); const { currency: primaryCurrency, @@ -109,6 +122,7 @@ const AssetList = ({ onClickAsset }) => { shouldHideZeroBalanceTokens, ); + // An array of string balances (ex: ["1.90", "22290.01", ...]) const dollarBalances = tokensWithBalances.map((token) => { const contractExchangeTokenKey = Object.keys(contractExchangeRates).find( (key) => isEqualCaseInsensitive(key, token.address), @@ -131,15 +145,32 @@ const AssetList = ({ onClickAsset }) => { return fiat; }); - const totalFiat = formatCurrency( - sumDecimals(nativeFiat, ...dollarBalances).toString(10), + // Total native and token fiat balance as a string (ex: "8.90") + const totalFiatBalance = sumDecimals(nativeFiat, ...dollarBalances).toString( + 10, + ); + + // Fiat balance formatted in user's desired currency (ex: "$8.90") + const formattedTotalFiatBalance = formatCurrency( + totalFiatBalance, currentCurrency, ); + const balanceIsZero = Number(totalFiatBalance) === 0; + const isBuyableChain = useSelector(getIsBuyableChain); + const shouldShowBuy = isBuyableChain && balanceIsZero; + const shouldShowReceive = balanceIsZero; + const { openBuyCryptoInPdapp } = useRamps(); + const chainId = useSelector(getCurrentChainId); + const defaultSwapsToken = useSelector(getSwapsDefaultToken); + return ( <> {process.env.MULTICHAIN ? ( - + ) : null} {detectedTokens.length > 0 && !isTokenDetectionInactiveOnNonMainnetSupportedNetwork && ( @@ -148,31 +179,74 @@ const AssetList = ({ onClickAsset }) => { margin={4} /> )} - onClickAsset(nativeCurrency)} - title={nativeCurrency} - primary={ - primaryCurrencyProperties.value ?? secondaryCurrencyProperties.value - } - tokenSymbol={primaryCurrencyProperties.suffix} - secondary={showFiat ? secondaryCurrencyDisplay : undefined} - tokenImage={balanceIsLoading ? null : primaryTokenImage} - /> - { - onClickAsset(tokenAddress); - trackEvent({ - event: MetaMetricsEventName.TokenScreenOpened, - category: MetaMetricsEventCategory.Navigation, - properties: { - token_symbol: primaryCurrencyProperties.suffix, - location: 'Home', - }, - }); - }} - /> + {process.env.MULTICHAIN && (shouldShowBuy || shouldShowReceive) ? ( + + {shouldShowBuy ? ( + { + openBuyCryptoInPdapp(); + trackEvent({ + event: MetaMetricsEventName.NavBuyButtonClicked, + category: MetaMetricsEventCategory.Navigation, + properties: { + location: 'Home', + text: 'Buy', + chain_id: chainId, + token_symbol: defaultSwapsToken, + }, + }); + }} + /> + ) : null} + {shouldShowReceive ? ( + setShowReceiveModal(true)} + /> + ) : null} + {showReceiveModal ? ( + setShowReceiveModal(false)} + /> + ) : null} + + ) : ( + <> + onClickAsset(nativeCurrency)} + title={nativeCurrency} + primary={ + primaryCurrencyProperties.value ?? + secondaryCurrencyProperties.value + } + tokenSymbol={primaryCurrencyProperties.suffix} + secondary={showFiat ? secondaryCurrencyDisplay : undefined} + tokenImage={balanceIsLoading ? null : primaryTokenImage} + /> + { + onClickAsset(tokenAddress); + trackEvent({ + event: MetaMetricsEventName.TokenScreenOpened, + category: MetaMetricsEventCategory.Navigation, + properties: { + token_symbol: primaryCurrencyProperties.suffix, + location: 'Home', + }, + }); + }} + /> + + )} 0 ? 0 : 4}> diff --git a/ui/components/app/asset-list/asset-list.test.js b/ui/components/app/asset-list/asset-list.test.js index cb12394ac4f3..9ba19e0cf8f1 100644 --- a/ui/components/app/asset-list/asset-list.test.js +++ b/ui/components/app/asset-list/asset-list.test.js @@ -49,16 +49,20 @@ jest.mock('../../../hooks/useTokenTracker', () => { }; }); -const render = () => { +const render = ( + selectedAddress = mockState.metamask.selectedAddress, + balance = ETH_BALANCE, + chainId = CHAIN_IDS.MAINNET, +) => { const state = { ...mockState, metamask: { ...mockState.metamask, - providerConfig: { chainId: CHAIN_IDS.MAINNET }, + providerConfig: { chainId }, conversionRate: CONVERSION_RATE, cachedBalances: { [CHAIN_IDS.MAINNET]: { - [mockState.metamask.selectedAddress]: ETH_BALANCE, + [selectedAddress]: balance, }, }, contractExchangeRates: { @@ -66,6 +70,7 @@ const render = () => { [LINK_CONTRACT]: 0.00423239, [WBTC_CONTRACT]: 16.66575, }, + selectedAddress, }, }; const store = configureStore(state); @@ -81,10 +86,13 @@ describe('AssetList', () => { expect(screen.getByText('Refresh list')).toBeInTheDocument(); }); - it('calculates the correct fiat account total', () => { - process.env.MULTICHAIN = 1; - const { container } = render(); - expect(container).toMatchSnapshot(); - expect(screen.getByText('$63,356.88 USD')).toBeInTheDocument(); + describe('token fiat value calculations', () => { + it('calculates the correct fiat account total', () => { + process.env.MULTICHAIN = 1; + const { container } = render(); + expect(container).toMatchSnapshot(); + expect(screen.getByText('$63,356.88 USD')).toBeInTheDocument(); + jest.resetModules(); + }); }); }); diff --git a/ui/components/app/nfts-tab/nfts-tab.js b/ui/components/app/nfts-tab/nfts-tab.js index 9b4af2f201bd..80adfc62a8be 100644 --- a/ui/components/app/nfts-tab/nfts-tab.js +++ b/ui/components/app/nfts-tab/nfts-tab.js @@ -24,6 +24,7 @@ import { import { Box, ButtonLink, IconName, Text } from '../../component-library'; import NFTsDetectionNoticeNFTsTab from '../nfts-detection-notice-nfts-tab/nfts-detection-notice-nfts-tab'; import NftsItems from '../nfts-items'; +import { AssetListConversionButton } from '../../multichain'; export default function NftsTab() { const useNftDetection = useSelector(getUseNftDetection); @@ -46,14 +47,16 @@ export default function NftsTab() { checkAndUpdateAllNftsOwnershipStatus(); }; + const hasAnyNfts = Object.keys(collections).length > 0; + const showNftBanner = process.env.MULTICHAIN && hasAnyNfts === false; + if (nftsLoading) { return
{t('loadingNFTs')}
; } return ( - {Object.keys(collections).length > 0 || - previouslyOwnedCollection.nfts.length > 0 ? ( + {hasAnyNfts > 0 || previouslyOwnedCollection.nfts.length > 0 ? ( {isMainnet && !useNftDetection ? ( - + ) : null} + {showNftBanner ? ( + + + global.platform.openTab({ url: ZENDESK_URLS.NFT_TOKENS }) + } + /> + + ) : null} { expect(historyPushMock).toHaveBeenCalledWith(SECURITY_ROUTE); }); }); + + describe('nft conversion banner', () => { + it('shows the NFT conversion banner when there are no NFTs', () => { + process.env.MULTICHAIN = 1; + const { queryByText } = render({ + selectedAddress: ACCOUNT_1, + nfts: [], + }); + + expect(queryByText('Learn more about NFTs')).toBeInTheDocument(); + }); + + it('does not show the NFT conversion banner when there are NFTs', () => { + process.env.MULTICHAIN = 1; + const { queryByText } = render({ + selectedAddress: ACCOUNT_1, + nfts: NFTS, + }); + + expect(queryByText('Learn more about NFTs')).not.toBeInTheDocument(); + }); + }); }); diff --git a/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.js b/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.js new file mode 100644 index 000000000000..8869daafe2ae --- /dev/null +++ b/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.js @@ -0,0 +1,82 @@ +import React from 'react'; +import PropTypes from 'prop-types'; + +import { IconName, Box, IconSize, Icon, Text } from '../../component-library'; +import { + AlignItems, + BorderRadius, + Display, +} from '../../../helpers/constants/design-system'; + +import { useI18nContext } from '../../../hooks/useI18nContext'; + +const ASSET_LIST_CONVERSION_BUTTON_VARIANTS = { + buy: { + color: 'var(--color-info-default)', + backgroundImage: 'url(/images/token-list-buy-background.png)', + text: 'buy', + icon: IconName.Add, + }, + receive: { + color: 'var(--color-flask-default)', + backgroundImage: 'url(/images/token-list-receive-background.png)', + text: 'receive', + icon: IconName.Arrow2Down, + }, + nft: { + color: 'var(--color-error-alternative)', + backgroundImage: 'url(/images/token-list-nfts-background.png)', + text: 'nftLearnMore', + icon: IconName.Book, + }, +}; + +export const AssetListConversionButton = ({ onClick, variant }) => { + const t = useI18nContext(); + const { color, backgroundImage, text, icon } = + ASSET_LIST_CONVERSION_BUTTON_VARIANTS[variant]; + + return ( + + + + + + + + + {t(text)} + + + + ); +}; + +AssetListConversionButton.propTypes = { + /** + * Executes when the button is clicked + */ + onClick: PropTypes.func.isRequired, + /** + * Text within the button body + */ + variant: PropTypes.oneOf(['buy', 'receive', 'nft']), +}; diff --git a/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.scss b/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.scss new file mode 100644 index 000000000000..fea379efe2a5 --- /dev/null +++ b/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.scss @@ -0,0 +1,20 @@ +.asset-list-conversion-button { + min-width: 157px; + height: 56px; + flex-grow: 1; + + + &__contents { + flex-grow: 1; + + &__button-wrapper { + background: var(--brand-colors-white-white000); + width: 24px; + height: 24px; + } + + &__text { + color: var(--brand-colors-white-white000); + } + } +} diff --git a/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.stories.js b/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.stories.js new file mode 100644 index 000000000000..4bf7248073ba --- /dev/null +++ b/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.stories.js @@ -0,0 +1,25 @@ +import React from 'react'; +import { AssetListConversionButton } from '.'; + +export default { + title: 'Components/Multichain/AssetListConversionButton', + component: AssetListConversionButton, + argTypes: { + variant: { + control: 'text', + }, + }, + args: { + variant: 'buy', + onClick: () => undefined, + onClose: () => undefined, + }, +}; + +export const DefaultStory = (args) => ; +DefaultStory.storyName = 'Default'; + +export const ReceiveStory = (args) => ( + +); +ReceiveStory.storyName = 'Receive'; diff --git a/ui/components/multichain/asset-list-conversion-button/index.js b/ui/components/multichain/asset-list-conversion-button/index.js new file mode 100644 index 000000000000..c8c6aa20e7e7 --- /dev/null +++ b/ui/components/multichain/asset-list-conversion-button/index.js @@ -0,0 +1 @@ +export { AssetListConversionButton } from './asset-list-conversion-button'; diff --git a/ui/components/multichain/index.js b/ui/components/multichain/index.js index 38ab4e6db18d..a2d8c5d7db17 100644 --- a/ui/components/multichain/index.js +++ b/ui/components/multichain/index.js @@ -23,3 +23,4 @@ export { AccountDetailsMenuItem, ViewExplorerMenuItem } from './menu-items'; export { ImportTokensModal } from './import-tokens-modal'; export { SelectActionModal } from './select-action-modal'; export { SelectActionModalItem } from './select-action-modal-item'; +export { AssetListConversionButton } from './asset-list-conversion-button'; diff --git a/ui/components/multichain/multichain-components.scss b/ui/components/multichain/multichain-components.scss index 59f12129f5e7..124bc2af08bf 100644 --- a/ui/components/multichain/multichain-components.scss +++ b/ui/components/multichain/multichain-components.scss @@ -22,3 +22,4 @@ @import 'nft-item/nft-item'; @import 'import-tokens-modal/import-tokens-modal'; @import 'select-action-modal-item/select-action-modal-item'; +@import 'asset-list-conversion-button/asset-list-conversion-button'; diff --git a/ui/components/multichain/receive-modal/index.js b/ui/components/multichain/receive-modal/index.js new file mode 100644 index 000000000000..7249a755ab7f --- /dev/null +++ b/ui/components/multichain/receive-modal/index.js @@ -0,0 +1 @@ +export { ReceiveModal } from './receive-modal'; diff --git a/ui/components/multichain/receive-modal/receive-modal.js b/ui/components/multichain/receive-modal/receive-modal.js new file mode 100644 index 000000000000..03b59c845062 --- /dev/null +++ b/ui/components/multichain/receive-modal/receive-modal.js @@ -0,0 +1,79 @@ +import React from 'react'; +import { useSelector } from 'react-redux'; +import PropTypes from 'prop-types'; +import { + AvatarAccount, + AvatarAccountSize, + AvatarAccountVariant, + Box, + Modal, + ModalContent, + ModalHeader, + ModalOverlay, + Text, +} from '../../component-library'; +import QrView from '../../ui/qr-code'; +import { useI18nContext } from '../../../hooks/useI18nContext'; +import { getMetaMaskAccountsOrdered, getUseBlockie } from '../../../selectors'; +import { + AlignItems, + BlockSize, + Display, + FlexDirection, + JustifyContent, + TextAlign, + TextVariant, +} from '../../../helpers/constants/design-system'; + +export const ReceiveModal = ({ address, onClose }) => { + const t = useI18nContext(); + const useBlockie = useSelector(getUseBlockie); + const accounts = useSelector(getMetaMaskAccountsOrdered); + const { name } = accounts.find((account) => account.address === address); + + return ( + + + + + {t('receive')} + + + + + + {name} + + + + + + + + ); +}; + +ReceiveModal.propTypes = { + address: PropTypes.string.isRequired, + onClose: PropTypes.func.isRequired, +}; diff --git a/ui/components/multichain/receive-modal/receive-modal.stories.js b/ui/components/multichain/receive-modal/receive-modal.stories.js new file mode 100644 index 000000000000..412de6d22fac --- /dev/null +++ b/ui/components/multichain/receive-modal/receive-modal.stories.js @@ -0,0 +1,33 @@ +import React from 'react'; + +import { Provider } from 'react-redux'; + +import testData from '../../../../.storybook/test-data'; +import configureStore from '../../../store/store'; + +import { ReceiveModal } from '.'; + +const store = configureStore(testData); + +export default { + title: 'Components/Multichain/ReceiveModal', + component: ReceiveModal, + argTypes: { + address: { + control: 'text', + }, + onClose: { + action: 'onClose', + }, + }, + args: { + address: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4', + onClose: () => undefined, + }, +}; + +export const DefaultStory = (args) => ; +DefaultStory.decorators = [ + (story) => {story()}, +]; +DefaultStory.storyName = 'Default'; diff --git a/ui/components/multichain/receive-modal/receive-modal.test.js b/ui/components/multichain/receive-modal/receive-modal.test.js new file mode 100644 index 000000000000..e31e9e593020 --- /dev/null +++ b/ui/components/multichain/receive-modal/receive-modal.test.js @@ -0,0 +1,27 @@ +import React from 'react'; +import { screen } from '@testing-library/react'; +import { toChecksumHexAddress } from '@metamask/controller-utils'; +import mockState from '../../../../test/data/mock-state.json'; +import { renderWithProvider } from '../../../../test/jest'; +import configureStore from '../../../store/store'; +import { ReceiveModal } from '.'; + +describe('ReceiveModal', () => { + const address = '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'; + + const render = () => + renderWithProvider( + , + configureStore(mockState), + ); + + it('should show the correct account address and name', () => { + render(); + // Check for the copy button + expect( + screen.queryByText(toChecksumHexAddress(address)), + ).toBeInTheDocument(); + // Check for the title + expect(screen.queryByText('Test Account')).toBeInTheDocument(); + }); +}); From 360ab36c877f356f412a37657afe785da3e444a1 Mon Sep 17 00:00:00 2001 From: sahar-fehri Date: Mon, 2 Oct 2023 17:49:24 +0200 Subject: [PATCH 017/219] fix: fix contract address display in confirmation page (#21042) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** Sometimes the confirmation transaction page displays the destination wallet address rather than the contract address. Here is related github issue: https://github.com/MetaMask/metamask-extension/issues/19502. ## **Manual testing steps** _1. Go to : https://metamask.github.io/test-dapp/ or you can use etherscan on a contract address _2. Deploy ERC1155 smart contract _3. Call safeBatchTransferFrom function and notice the confirmation page does displays the destination address and not the contract address (side by side with the contract function name) ## **Screenshots/Recordings** ### **Before** Calling mintBatch fct displays contract address correctly ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/302d0e4c-2da7-4898-a621-72a4590e3592) Calling safeBatchTransferFrom fct displays the destination address instead: ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/2c51d863-9890-4491-ba0d-6051c3003cb8) ### **After** Mint batch and safeTransferFromBatch display contract address ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/7ff35d8b-fedc-4d2c-9eab-9539be211c6a) ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/96e9eb9e-7b9b-4923-a256-707d14f8d891) And if you are sending a transfer transaction (contractInteraction) to an address already imported in your wallet, it shows : ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/6e08d800-0ac7-4c80-b0fe-7a5878388ae7) ## **Related issues** [_Fixes #MMAssets-33_](https://consensyssoftware.atlassian.net/browse/MMASSETS-33) ## **Pre-merge author checklist** - [x ] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ x] I've clearly explained: - [ ] What problem this PR is solving. - [ ] How this problem was solved. - [ ] How reviewers can test my changes. - [x ] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ x] I’ve documented any added code. - [ x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- test/data/mock-state.json | 8 ++++++++ .../confirm-page-container-container.test.js | 2 ++ ...m-page-container-content.component.test.js | 19 +++++++++++++++++-- ...onfirm-page-container-summary.component.js | 13 ++++++++----- 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/test/data/mock-state.json b/test/data/mock-state.json index 95a1e6caff3d..6c2064108972 100644 --- a/test/data/mock-state.json +++ b/test/data/mock-state.json @@ -20,6 +20,14 @@ "warning": null, "customTokenAmount": "10" }, + "confirmTransaction": { + "txData": { + "txParams": { + "gas": "0x153e2", + "value": "0x0" + } + } + }, "history": { "mostRecentOverviewPage": "/mostRecentOverviewPage" }, diff --git a/ui/components/app/confirm-page-container/confirm-page-container-container.test.js b/ui/components/app/confirm-page-container/confirm-page-container-container.test.js index 6432fad41027..a6afdcfc6368 100644 --- a/ui/components/app/confirm-page-container/confirm-page-container-container.test.js +++ b/ui/components/app/confirm-page-container/confirm-page-container-container.test.js @@ -319,6 +319,8 @@ describe('Confirm Page Container Container Test', () => { }; mockState.metamask.addressBook = addressBook; + mockState.confirmTransaction.txData.txParams.to = + '0x7a1A4Ad9cc746a70ee58568466f7996dD0aCE4E8'; const store = configureMockStore()(mockState); diff --git a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js index f81301c195ec..5261d935c185 100644 --- a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js +++ b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js @@ -7,6 +7,7 @@ import { INSUFFICIENT_FUNDS_ERROR_KEY, TRANSACTION_ERROR_KEY, } from '../../../../helpers/constants/error-keys'; +import { shortenAddress } from '../../../../helpers/utils/util'; import ConfirmPageContainerContent from './confirm-page-container-content.component'; describe('Confirm Page Container Content', () => { @@ -25,6 +26,17 @@ describe('Confirm Page Container Content', () => { }, }, }, + identities: {}, + tokenList: {}, + }, + confirmTransaction: { + txData: { + txParams: { + gas: '0x153e2', + value: '0x0', + to: '0x0BC30598F0F386371eB3d2195AcAA14C7566534b', + }, + }, }, }; @@ -106,7 +118,7 @@ describe('Confirm Page Container Content', () => { expect(props.onCancel).toHaveBeenCalledTimes(1); }); - it('render contract address name from addressBook in title for contract', async () => { + it('render contract address in the content component', async () => { props.disabled = false; props.toAddress = '0x06195827297c7A80a443b6894d3BDB8824b43896'; props.transactionType = TransactionType.contractInteraction; @@ -114,8 +126,11 @@ describe('Confirm Page Container Content', () => { , store, ); + const expectedAddress = shortenAddress( + mockStore.confirmTransaction.txData.txParams.to, + ); - expect(queryByText('Address Book Account 1')).toBeInTheDocument(); + expect(queryByText(`${expectedAddress}`)).toBeInTheDocument(); }); it('render simple title without address name for simple send', async () => { diff --git a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js index 46a3f068f42e..2421f11ee39b 100644 --- a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js +++ b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js @@ -9,7 +9,7 @@ import { TransactionType } from '../../../../../../shared/constants/transaction' import { toChecksumHexAddress } from '../../../../../../shared/modules/hexstring-utils'; import { useI18nContext } from '../../../../../hooks/useI18nContext'; import useAddressDetails from '../../../../../hooks/useAddressDetails'; -import { getIpfsGateway } from '../../../../../selectors'; +import { getIpfsGateway, txDataSelector } from '../../../../../selectors'; import Identicon from '../../../../ui/identicon'; import InfoTooltip from '../../../../ui/info-tooltip'; @@ -25,7 +25,6 @@ const ConfirmPageContainerSummary = (props) => { subtitleComponent, className, tokenAddress, - toAddress, nonce, origin, image, @@ -36,6 +35,10 @@ const ConfirmPageContainerSummary = (props) => { const t = useI18nContext(); const ipfsGateway = useSelector(getIpfsGateway); + const txData = useSelector(txDataSelector); + const { txParams = {} } = txData; + const { to: txParamsToAddress } = txParams; + const contractInitiatedTransactionType = [ TransactionType.contractInteraction, TransactionType.tokenMethodTransfer, @@ -48,14 +51,15 @@ const ConfirmPageContainerSummary = (props) => { if (isContractTypeTransaction) { // If the transaction is TOKEN_METHOD_TRANSFER or TOKEN_METHOD_TRANSFER_FROM // the contract address is passed down as tokenAddress, if it is anyother - // type of contract interaction it is passed as toAddress + // type of contract interaction it is "to" from txParams + contractAddress = transactionType === TransactionType.tokenMethodTransfer || transactionType === TransactionType.tokenMethodTransferFrom || transactionType === TransactionType.tokenMethodSafeTransferFrom || transactionType === TransactionType.tokenMethodSetApprovalForAll ? tokenAddress - : toAddress; + : txParamsToAddress; } const { toName, isTrusted } = useAddressDetails(contractAddress); @@ -146,7 +150,6 @@ ConfirmPageContainerSummary.propTypes = { subtitleComponent: PropTypes.node, className: PropTypes.string, tokenAddress: PropTypes.string, - toAddress: PropTypes.string, nonce: PropTypes.string, origin: PropTypes.string.isRequired, transactionType: PropTypes.string, From dc01cc0f6ba87f05ecb35f7afbc7e79676b933a5 Mon Sep 17 00:00:00 2001 From: sahar-fehri Date: Mon, 2 Oct 2023 17:49:36 +0200 Subject: [PATCH 018/219] fix: display warning when sending zero tokens (#21091) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This PR display a warning when the user attempts to send zero amount in tokens/native currency. ## **Manual testing steps** _1. Click on any token _2. Click Send _3. Enter zero as amount _4. Click next and notice the display of warning. ## **Screenshots/Recordings** ### **Before** ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/7f37a546-0c27-4e78-99b3-a739eff27986) ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/28e9d00f-b1a3-4230-b908-a013400b0175) ### **After** Sending zero ETH ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/8b81d6d1-6e7e-40a5-b80d-6410e929c56d) Sending zero token (DAI) ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/c4b03fdd-587b-46a7-8c55-8f39cf946c65) Not displayed when sending amount in ETH !== 0 ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/14e12b85-3cef-4c49-b2f6-39e1d086a30f) Not displayed when sending amount of tokens different than zero ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/ce179f3f-7925-490f-849b-bbde4eaa1a40) ## **Related issues** [_Fixes #MMASSETS-44](https://consensyssoftware.atlassian.net/browse/MMASSETS-44) ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [x] I’ve indicated what issue this PR is linked to: Fixes #??? - [x] I’ve included tests if applicable. - [x] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- app/_locales/en/messages.json | 3 + .../transaction-alerts/transaction-alerts.js | 35 ++- .../transaction-alerts.stories.js | 31 +++ .../transaction-alerts.test.js | 227 +++++++++++++++++- .../confirm-send-ether.test.js.snap | 15 ++ .../confirm-token-transaction-base.js | 1 + .../confirm-transaction-base.component.js | 3 + 7 files changed, 311 insertions(+), 4 deletions(-) diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index f278ae748bf4..77c8e3ec8f06 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -3948,6 +3948,9 @@ "message": "Warning: you are about to send to a token contract which could result in a loss of funds. $1", "description": "$1 is a clickable link with text defined by the 'learnMoreUpperCase' key. The link will open to a support article regarding the known contract address warning" }, + "sendingZeroAmount": { + "message": "You are sending 0 $1." + }, "sepolia": { "message": "Sepolia test network" }, diff --git a/ui/components/app/transaction-alerts/transaction-alerts.js b/ui/components/app/transaction-alerts/transaction-alerts.js index 0738fdc104b4..c72d58bf1b68 100644 --- a/ui/components/app/transaction-alerts/transaction-alerts.js +++ b/ui/components/app/transaction-alerts/transaction-alerts.js @@ -1,7 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; import { useSelector } from 'react-redux'; - import { PriorityLevels } from '../../../../shared/constants/gas'; import { submittedPendingTransactionsSelector } from '../../../selectors'; import { useGasFeeContext } from '../../../contexts/gasFee'; @@ -16,16 +15,44 @@ import { isSuspiciousResponse } from '../../../../shared/modules/security-provid import BlockaidBannerAlert from '../security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert'; ///: END:ONLY_INCLUDE_IN import SecurityProviderBannerMessage from '../security-provider-banner-message/security-provider-banner-message'; +import { getNativeCurrency } from '../../../ducks/metamask/metamask'; +import { TransactionType } from '../../../../shared/constants/transaction'; +import { parseStandardTokenTransactionData } from '../../../../shared/modules/transaction.utils'; +import { getTokenValueParam } from '../../../../shared/lib/metamask-controller-utils'; const TransactionAlerts = ({ userAcknowledgedGasMissing, setUserAcknowledgedGasMissing, txData, + tokenSymbol, }) => { const { estimateUsed, hasSimulationError, supportsEIP1559, isNetworkBusy } = useGasFeeContext(); const pendingTransactions = useSelector(submittedPendingTransactionsSelector); const t = useI18nContext(); + const nativeCurrency = useSelector(getNativeCurrency); + const transactionData = txData.txParams.data; + const currentTokenSymbol = tokenSymbol || nativeCurrency; + let currentTokenAmount; + + if (txData.type === TransactionType.simpleSend) { + currentTokenAmount = txData.txParams.value; + } + if (txData.type === TransactionType.tokenMethodTransfer) { + const tokenData = parseStandardTokenTransactionData(transactionData); + currentTokenAmount = getTokenValueParam(tokenData); + } + + // isSendingZero is true when either sending native tokens where the value is in txParams + // or sending tokens where the value is in the txData + // We want to only display this warning in the cases where txType is simpleSend || transfer and not contractInteractions + const hasProperTxType = + txData.type === TransactionType.simpleSend || + txData.type === TransactionType.tokenMethodTransfer; + + const isSendingZero = + hasProperTxType && + (currentTokenAmount === '0x0' || currentTokenAmount === '0'); return (
@@ -85,6 +112,11 @@ const TransactionAlerts = ({ {t('networkIsBusy')} ) : null} + {isSendingZero && ( + + {t('sendingZeroAmount', [currentTokenSymbol])} + + )}
); }; @@ -93,6 +125,7 @@ TransactionAlerts.propTypes = { userAcknowledgedGasMissing: PropTypes.bool, setUserAcknowledgedGasMissing: PropTypes.func, txData: PropTypes.object, + tokenSymbol: PropTypes.string, }; export default TransactionAlerts; diff --git a/ui/components/app/transaction-alerts/transaction-alerts.stories.js b/ui/components/app/transaction-alerts/transaction-alerts.stories.js index 72426dd9202e..a53cd7a23ff0 100644 --- a/ui/components/app/transaction-alerts/transaction-alerts.stories.js +++ b/ui/components/app/transaction-alerts/transaction-alerts.stories.js @@ -98,6 +98,11 @@ export default { }, args: { userAcknowledgedGasMissing: false, + txData: { + txParams: { + value: '0x1', + }, + }, }, }; @@ -121,6 +126,15 @@ export const DefaultStory = (args) => ( ); DefaultStory.storyName = 'Default'; +DefaultStory.args = { + ...DefaultStory.args, + txData: { + txParams: { + value: '0x0', + }, + type: 'simpleSend', + }, +}; export const SimulationError = (args) => ( @@ -170,3 +184,20 @@ export const BusyNetwork = (args) => ( ); BusyNetwork.storyName = 'BusyNetwork'; + +export const SendingZeroAmount = (args) => ( + + + + + +); +SendingZeroAmount.storyName = 'SendingZeroAmount'; +SendingZeroAmount.args = { + txData: { + txParams: { + value: '0x0', + }, + type: 'simpleSend', + }, +}; diff --git a/ui/components/app/transaction-alerts/transaction-alerts.test.js b/ui/components/app/transaction-alerts/transaction-alerts.test.js index 8bbda90e37a2..0918801b77ab 100644 --- a/ui/components/app/transaction-alerts/transaction-alerts.test.js +++ b/ui/components/app/transaction-alerts/transaction-alerts.test.js @@ -1,10 +1,14 @@ import React from 'react'; import { fireEvent } from '@testing-library/react'; +import sinon from 'sinon'; import { SECURITY_PROVIDER_MESSAGE_SEVERITY } from '../../../../shared/constants/security-provider'; import { renderWithProvider } from '../../../../test/jest'; import { submittedPendingTransactionsSelector } from '../../../selectors/transactions'; import { useGasFeeContext } from '../../../contexts/gasFee'; import configureStore from '../../../store/store'; +import mockState from '../../../../test/data/mock-state.json'; +import * as txUtil from '../../../../shared/modules/transaction.utils'; +import * as metamaskControllerUtils from '../../../../shared/lib/metamask-controller-utils'; import TransactionAlerts from './transaction-alerts'; jest.mock('../../../selectors/transactions', () => { @@ -20,12 +24,13 @@ function render({ componentProps = {}, useGasFeeContextValue = {}, submittedPendingTransactionsSelectorValue = null, + mockedStore = mockState, }) { useGasFeeContext.mockReturnValue(useGasFeeContextValue); submittedPendingTransactionsSelector.mockReturnValue( submittedPendingTransactionsSelectorValue, ); - const store = configureStore({}); + const store = configureStore(mockedStore); return renderWithProvider(, store); } @@ -44,6 +49,9 @@ describe('TransactionAlerts', () => { operator: '0x92a3b9773b1763efa556f55ccbeb20441962d9b2', }, }, + txParams: { + value: '0x1', + }, }, }, }); @@ -59,6 +67,9 @@ describe('TransactionAlerts', () => { reason: 'Some reason...', reason_header: 'Some reason header...', }, + txParams: { + value: '0x1', + }, }, }, }); @@ -79,6 +90,9 @@ describe('TransactionAlerts', () => { securityProviderResponse: { flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITY.NOT_MALICIOUS, }, + txParams: { + value: '0x1', + }, }, }, }); @@ -100,6 +114,13 @@ describe('TransactionAlerts', () => { supportsEIP1559: true, hasSimulationError: true, }, + componentProps: { + txData: { + txParams: { + value: '0x1', + }, + }, + }, }); expect( @@ -116,6 +137,13 @@ describe('TransactionAlerts', () => { supportsEIP1559: true, hasSimulationError: true, }, + componentProps: { + txData: { + txParams: { + value: '0x1', + }, + }, + }, }); expect(getByText('I want to proceed anyway')).toBeInTheDocument(); }); @@ -127,7 +155,14 @@ describe('TransactionAlerts', () => { supportsEIP1559: true, hasSimulationError: true, }, - componentProps: { setUserAcknowledgedGasMissing }, + componentProps: { + setUserAcknowledgedGasMissing, + txData: { + txParams: { + value: '0x1', + }, + }, + }, }); fireEvent.click(getByText('I want to proceed anyway')); expect(setUserAcknowledgedGasMissing).toHaveBeenCalled(); @@ -141,7 +176,14 @@ describe('TransactionAlerts', () => { supportsEIP1559: true, hasSimulationError: true, }, - componentProps: { userAcknowledgedGasMissing: true }, + componentProps: { + userAcknowledgedGasMissing: true, + txData: { + txParams: { + value: '0x1', + }, + }, + }, }); expect( queryByText('I want to proceed anyway'), @@ -156,6 +198,13 @@ describe('TransactionAlerts', () => { useGasFeeContextValue: { supportsEIP1559: true, }, + componentProps: { + txData: { + txParams: { + value: '0x1', + }, + }, + }, }); expect( queryByText( @@ -170,6 +219,13 @@ describe('TransactionAlerts', () => { const { getByText } = render({ useGasFeeContextValue: { supportsEIP1559: true }, submittedPendingTransactionsSelectorValue: [{ some: 'transaction' }], + componentProps: { + txData: { + txParams: { + value: '0x1', + }, + }, + }, }); expect( getByText('You have (1) pending transaction.'), @@ -185,6 +241,13 @@ describe('TransactionAlerts', () => { { some: 'transaction' }, { some: 'transaction' }, ], + componentProps: { + txData: { + txParams: { + value: '0x1', + }, + }, + }, }); expect( getByText('You have (2) pending transactions.'), @@ -197,6 +260,13 @@ describe('TransactionAlerts', () => { const { queryByText } = render({ useGasFeeContextValue: { supportsEIP1559: true }, submittedPendingTransactionsSelectorValue: [], + componentProps: { + txData: { + txParams: { + value: '0x1', + }, + }, + }, }); expect( queryByText('You have (0) pending transactions.'), @@ -211,6 +281,13 @@ describe('TransactionAlerts', () => { supportsEIP1559: true, balanceError: false, }, + componentProps: { + txData: { + txParams: { + value: '0x1', + }, + }, + }, }); expect(queryByText('Insufficient funds.')).not.toBeInTheDocument(); }); @@ -223,6 +300,13 @@ describe('TransactionAlerts', () => { supportsEIP1559: true, estimateUsed: 'low', }, + componentProps: { + txData: { + txParams: { + value: '0x1', + }, + }, + }, }); expect( getByText('Future transactions will queue after this one.'), @@ -237,6 +321,13 @@ describe('TransactionAlerts', () => { supportsEIP1559: true, estimateUsed: 'something_else', }, + componentProps: { + txData: { + txParams: { + value: '0x1', + }, + }, + }, }); expect( queryByText('Future transactions will queue after this one.'), @@ -251,6 +342,13 @@ describe('TransactionAlerts', () => { supportsEIP1559: true, isNetworkBusy: true, }, + componentProps: { + txData: { + txParams: { + value: '0x1', + }, + }, + }, }); expect( getByText( @@ -267,6 +365,13 @@ describe('TransactionAlerts', () => { supportsEIP1559: true, isNetworkBusy: false, }, + componentProps: { + txData: { + txParams: { + value: '0x1', + }, + }, + }, }); expect( queryByText( @@ -285,6 +390,13 @@ describe('TransactionAlerts', () => { supportsEIP1559: false, hasSimulationError: true, }, + componentProps: { + txData: { + txParams: { + value: '0x1', + }, + }, + }, }); expect( @@ -300,6 +412,13 @@ describe('TransactionAlerts', () => { const { queryByText } = render({ useGasFeeContextValue: { supportsEIP1559: false }, submittedPendingTransactionsSelectorValue: [{ some: 'transaction' }], + componentProps: { + txData: { + txParams: { + value: '0x1', + }, + }, + }, }); expect( queryByText('You have (1) pending transaction.'), @@ -314,6 +433,13 @@ describe('TransactionAlerts', () => { supportsEIP1559: false, balanceError: true, }, + componentProps: { + txData: { + txParams: { + value: '0x1', + }, + }, + }, }); expect(queryByText('Insufficient funds.')).not.toBeInTheDocument(); }); @@ -326,6 +452,13 @@ describe('TransactionAlerts', () => { supportsEIP1559: false, estimateUsed: 'low', }, + componentProps: { + txData: { + txParams: { + value: '0x1', + }, + }, + }, }); expect( queryByText( @@ -342,6 +475,13 @@ describe('TransactionAlerts', () => { supportsEIP1559: false, isNetworkBusy: true, }, + componentProps: { + txData: { + txParams: { + value: '0x1', + }, + }, + }, }); expect( queryByText( @@ -351,4 +491,85 @@ describe('TransactionAlerts', () => { }); }); }); + + describe('when sending zero amount it should display a warning', () => { + it('should display alert if sending zero tokens', () => { + // Mock + const testTokenData = { + args: 'decoded-param', + }; + const testTokenValue = '0'; + + const parseStandardTokenTransactionDataStub = sinon.stub( + txUtil, + 'parseStandardTokenTransactionData', + ); + const getTokenValueStub = sinon.stub( + metamaskControllerUtils, + 'getTokenValueParam', + ); + + parseStandardTokenTransactionDataStub.callsFake(() => testTokenData); + getTokenValueStub.callsFake(() => testTokenValue); + // render + const { getByText } = render({ + componentProps: { + txData: { + txParams: { + value: '0x0', + }, + type: 'transfer', + }, + tokenSymbol: 'DAI', + }, + }); + // assert + expect(getByText('You are sending 0 DAI.')).toBeInTheDocument(); + }); + + it('should display alert if sending zero of native currency', () => { + const { getByText } = render({ + componentProps: { + txData: { + txParams: { + value: '0x0', + }, + type: 'simpleSend', + }, + tokenSymbol: undefined, + }, + }); + expect(getByText('You are sending 0 ETH.')).toBeInTheDocument(); + }); + }); + + describe('when sending amount different than zero should not display alert', () => { + it('should not display alerts if sending amount different than zero in native currency', () => { + const { queryByText } = render({ + componentProps: { + txData: { + txParams: { + value: '0x5af3107a4000', + }, + }, + tokenSymbol: undefined, + }, + }); + expect(queryByText('You are sending 0 ETH.')).not.toBeInTheDocument(); + }); + + it('should not display alerts if sending amount different than zero in tokens', () => { + const { queryByText } = render({ + componentProps: { + txData: { + txParams: { + value: '0x0', + }, + }, + tokenSymbol: 'DAI', + }, + }); + expect(queryByText('You are sending 0 DAI.')).not.toBeInTheDocument(); + }); + }); }); diff --git a/ui/pages/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap b/ui/pages/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap index 7e905833d834..bf7f3f28c1f8 100644 --- a/ui/pages/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap +++ b/ui/pages/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap @@ -329,6 +329,21 @@ exports[`ConfirmSendEther should render correct information for for confirm send

+
+ +
+

+ You are sending 0 ETH. +

+
+
); } diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js index f610f6b92214..6cd2da349f3b 100644 --- a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js +++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js @@ -145,6 +145,7 @@ export default class ConfirmTransactionBase extends Component { isNoteToTraderSupported: PropTypes.bool, isMainBetaFlask: PropTypes.bool, displayAccountBalanceHeader: PropTypes.bool, + tokenSymbol: PropTypes.string, }; state = { @@ -324,6 +325,7 @@ export default class ConfirmTransactionBase extends Component { nativeCurrency, isBuyableChain, useCurrencyRateCheck, + tokenSymbol, } = this.props; const { t } = this.context; const { userAcknowledgedGasMissing } = this.state; @@ -461,6 +463,7 @@ export default class ConfirmTransactionBase extends Component { networkName={networkName} type={txData.type} isBuyableChain={isBuyableChain} + tokenSymbol={tokenSymbol} /> Date: Mon, 2 Oct 2023 18:31:36 +0100 Subject: [PATCH 019/219] [MMI] Deletes unnecessary logic for mmi (#20834) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Explanation MMI no longer needs this bit of logic 🧹 ## Pre-merge author checklist - [x] I've clearly explained: - [x] What problem this PR is solving - [x] How this problem was solved - [x] How reviewers can test my changes - [x] Sufficient automated test coverage has been added --- app/scripts/controllers/mmi-controller.js | 43 +----------- .../rpc-method-middleware/handlers/index.js | 2 - .../handlers/institutional/mmi-open-swaps.js | 68 ------------------- app/scripts/metamask-controller.js | 3 - 4 files changed, 2 insertions(+), 114 deletions(-) delete mode 100644 app/scripts/lib/rpc-method-middleware/handlers/institutional/mmi-open-swaps.js diff --git a/app/scripts/controllers/mmi-controller.js b/app/scripts/controllers/mmi-controller.js index d6e980e1be95..969b26427a13 100644 --- a/app/scripts/controllers/mmi-controller.js +++ b/app/scripts/controllers/mmi-controller.js @@ -1,7 +1,6 @@ import EventEmitter from 'events'; import log from 'loglevel'; import { captureException } from '@sentry/browser'; -import { isEqual } from 'lodash'; import { CUSTODIAN_TYPES } from '@metamask-institutional/custody-keyring'; import { updateCustodianTransactions, @@ -11,17 +10,10 @@ import { REFRESH_TOKEN_CHANGE_EVENT, INTERACTIVE_REPLACEMENT_TOKEN_CHANGE_EVENT, } from '@metamask-institutional/sdk'; -import { - handleMmiPortfolio, - setDashboardCookie, -} from '@metamask-institutional/portfolio-dashboard'; +import { handleMmiPortfolio } from '@metamask-institutional/portfolio-dashboard'; import { toChecksumHexAddress } from '../../../shared/modules/hexstring-utils'; import { CHAIN_IDS } from '../../../shared/constants/network'; -import { - BUILD_QUOTE_ROUTE, - CONNECT_HARDWARE_ROUTE, -} from '../../../ui/helpers/constants/routes'; -import { previousValueComparator } from '../lib/util'; +import { CONNECT_HARDWARE_ROUTE } from '../../../ui/helpers/constants/routes'; import { getPermissionBackgroundApiMethods } from './permissions'; export default class MMIController extends EventEmitter { @@ -63,17 +55,6 @@ export default class MMIController extends EventEmitter { }); } - this.preferencesController.store.subscribe( - previousValueComparator(async (prevState, currState) => { - const { identities: prevIdentities } = prevState; - const { identities: currIdentities } = currState; - if (isEqual(prevIdentities, currIdentities)) { - return; - } - await this.prepareMmiPortfolio(); - }, this.preferencesController.store.getState()), - ); - this.signatureController.hub.on( 'personal_sign:signed', async ({ signature, messageId }) => { @@ -584,20 +565,6 @@ export default class MMIController extends EventEmitter { }); } - async prepareMmiPortfolio() { - if (!process.env.IN_TEST) { - try { - const mmiDashboardData = await this.handleMmiDashboardData(); - const cookieSetUrls = - this.mmiConfigurationController.store.mmiConfiguration?.portfolio - ?.cookieSetUrls || []; - setDashboardCookie(mmiDashboardData, cookieSetUrls); - } catch (error) { - console.error(error); - } - } - } - async newUnsignedMessage(msgParams, req, version) { // The code path triggered by deferSetAsSigned: true is for custodial accounts const accountDetails = this.custodyController.getAccountDetails( @@ -673,12 +640,6 @@ export default class MMIController extends EventEmitter { return true; } - async handleMmiOpenSwaps(origin, address, chainId) { - await this.setAccountAndNetwork(origin, address, chainId); - this.platform.openExtensionInBrowser(BUILD_QUOTE_ROUTE); - return true; - } - async handleMmiOpenAddHardwareWallet() { await this.appStateController.getUnlockPromise(true); this.platform.openExtensionInBrowser(CONNECT_HARDWARE_ROUTE); diff --git a/app/scripts/lib/rpc-method-middleware/handlers/index.js b/app/scripts/lib/rpc-method-middleware/handlers/index.js index 126da76f9de4..a4c02fa71d66 100644 --- a/app/scripts/lib/rpc-method-middleware/handlers/index.js +++ b/app/scripts/lib/rpc-method-middleware/handlers/index.js @@ -11,7 +11,6 @@ import watchAsset from './watch-asset'; import mmiSupported from './institutional/mmi-supported'; import mmiAuthenticate from './institutional/mmi-authenticate'; import mmiPortfolio from './institutional/mmi-portfolio'; -import mmiOpenSwaps from './institutional/mmi-open-swaps'; import mmiCheckIfTokenIsPresent from './institutional/mmi-check-if-token-is-present'; import mmiSetAccountAndNetwork from './institutional/mmi-set-account-and-network'; import mmiOpenAddHardwareWallet from './institutional/mmi-open-add-hardware-wallet'; @@ -30,7 +29,6 @@ const handlers = [ mmiAuthenticate, mmiSupported, mmiPortfolio, - mmiOpenSwaps, mmiCheckIfTokenIsPresent, mmiSetAccountAndNetwork, mmiOpenAddHardwareWallet, diff --git a/app/scripts/lib/rpc-method-middleware/handlers/institutional/mmi-open-swaps.js b/app/scripts/lib/rpc-method-middleware/handlers/institutional/mmi-open-swaps.js deleted file mode 100644 index f0cdbd026c24..000000000000 --- a/app/scripts/lib/rpc-method-middleware/handlers/institutional/mmi-open-swaps.js +++ /dev/null @@ -1,68 +0,0 @@ -import { ethErrors } from 'eth-rpc-errors'; -import { RPC_ALLOWED_ORIGINS } from '@metamask-institutional/rpc-allowlist'; -import { MESSAGE_TYPE } from '../../../../../../shared/constants/app'; - -const mmiOpenSwaps = { - methodNames: [MESSAGE_TYPE.MMI_OPEN_SWAPS], - implementation: mmiOpenSwapsHandler, - hookNames: { - handleMmiOpenSwaps: true, - }, -}; -export default mmiOpenSwaps; - -/** - * @typedef {object} MmiOpenSwapsOptions - * @property {Function} handleMmiOpenSwaps - The metmaskinsititutional_open_swaps method implementation. - */ - -/** - * @typedef {object} MmiOpenSwapsParam - * @property {string} service - The service to which we are authenticating, e.g. 'codefi-compliance' - * @property {object} token - The token used to authenticate - */ - -/** - * @param {import('json-rpc-engine').JsonRpcRequest} req - The JSON-RPC request object. - * @param {import('json-rpc-engine').JsonRpcResponse} res - The JSON-RPC response object. - * @param {Function} _next - The json-rpc-engine 'next' callback. - * @param {Function} end - The json-rpc-engine 'end' callback. - * @param {WatchAssetOptions} options - */ -async function mmiOpenSwapsHandler( - req, - res, - _next, - end, - { handleMmiOpenSwaps }, -) { - try { - let validUrl = false; - // if (!RPC_ALLOWED_ORIGINS[MESSAGE_TYPE.MMI_PORTFOLIO].includes(req.origin)) { - RPC_ALLOWED_ORIGINS[MESSAGE_TYPE.MMI_PORTFOLIO].forEach((regexp) => { - // eslint-disable-next-line require-unicode-regexp - if (regexp.test(req.origin)) { - validUrl = true; - } - }); - // eslint-disable-next-line no-negated-condition - if (!validUrl) { - throw new Error('Unauthorized'); - } - - if (!req.params?.[0] || typeof req.params[0] !== 'object') { - return end( - ethErrors.rpc.invalidParams({ - message: `Expected single, object parameter. Received:\n${JSON.stringify( - req.params, - )}`, - }), - ); - } - const { address, network } = req.params[0]; - res.result = await handleMmiOpenSwaps(req.origin, address, network); - return end(); - } catch (error) { - return end(error); - } -} diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 27ebd056f8f3..684c64249864 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -4347,9 +4347,6 @@ export default class MetamaskController extends EventEmitter { handleMmiDashboardData: this.mmiController.handleMmiDashboardData.bind( this.mmiController, ), - handleMmiOpenSwaps: this.mmiController.handleMmiOpenSwaps.bind( - this.mmiController, - ), handleMmiSetAccountAndNetwork: this.mmiController.setAccountAndNetwork.bind(this.mmiController), handleMmiOpenAddHardwareWallet: From ab0fdeee13645fb65148bbe4976871058d0e065b Mon Sep 17 00:00:00 2001 From: Matthew Walsh Date: Tue, 3 Oct 2023 10:58:15 +0100 Subject: [PATCH 020/219] Add privacy setting to disable external name sources (#21045) --- app/_locales/en/messages.json | 9 +++ app/scripts/controllers/preferences.js | 16 ++++ app/scripts/controllers/preferences.test.js | 17 +++++ app/scripts/metamask-controller.js | 15 +++- .../__snapshots__/security-tab.test.js.snap | 75 +++++++++++++++++++ .../security-tab/security-tab.component.js | 56 ++++++++++++++ .../security-tab/security-tab.container.js | 14 ++++ ui/store/actions.ts | 10 +++ yarn.lock | 20 ++--- 9 files changed, 219 insertions(+), 13 deletions(-) diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 77c8e3ec8f06..79a76e98dbdf 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -1616,6 +1616,12 @@ "externalExtension": { "message": "External extension" }, + "externalNameSourcesSetting": { + "message": "Suggest address names" + }, + "externalNameSourcesSettingDescription": { + "message": "We pull data from third parties like Etherscan, Infura, and Lens Protocol, to suggest names for addresses on signatures requests. Turning on name suggestions exposes your IP address to these third parties." + }, "failed": { "message": "Failed" }, @@ -3973,6 +3979,9 @@ "settingsSearchMatchingNotFound": { "message": "No matching results found." }, + "settingsSubHeadingSignatures": { + "message": "Signature requests" + }, "show": { "message": "Show" }, diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js index ac209b576480..908e3d985855 100644 --- a/app/scripts/controllers/preferences.js +++ b/app/scripts/controllers/preferences.js @@ -106,6 +106,9 @@ export default class PreferencesController { snapsAddSnapAccountModalDismissed: false, ///: END:ONLY_INCLUDE_IN isLineaMainnetReleased: false, + ///: BEGIN:ONLY_INCLUDE_IN(petnames) + useExternalNameSources: true, + ///: END:ONLY_INCLUDE_IN ...opts.initState, }; @@ -261,6 +264,19 @@ export default class PreferencesController { } ///: END:ONLY_INCLUDE_IN + ///: BEGIN:ONLY_INCLUDE_IN(petnames) + /** + * Setter for the `useExternalNameSources` property + * + * @param {boolean} useExternalNameSources - Whether or not to use external name providers in the name controller. + */ + setUseExternalNameSources(useExternalNameSources) { + this.store.updateState({ + useExternalNameSources, + }); + } + ///: END:ONLY_INCLUDE_IN + /** * Setter for the `advancedGasFee` property * diff --git a/app/scripts/controllers/preferences.test.js b/app/scripts/controllers/preferences.test.js index 106871aa5d71..a46730c8c9ab 100644 --- a/app/scripts/controllers/preferences.test.js +++ b/app/scripts/controllers/preferences.test.js @@ -419,4 +419,21 @@ describe('preferences controller', () => { }); }); }); + + ///: BEGIN:ONLY_INCLUDE_IN(petnames) + describe('setUseExternalNameSources', () => { + it('should default to true', () => { + expect( + preferencesController.store.getState().useExternalNameSources, + ).toStrictEqual(true); + }); + + it('should set the useExternalNameSources property in state', () => { + preferencesController.setUseExternalNameSources(false); + expect( + preferencesController.store.getState().useExternalNameSources, + ).toStrictEqual(false); + }); + }); + ///: END:ONLY_INCLUDE_IN }); diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 684c64249864..6a0a2edc2f19 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -1537,6 +1537,9 @@ export default class MetamaskController extends EventEmitter { ); ///: BEGIN:ONLY_INCLUDE_IN(petnames) + const isExternalNameSourcesEnabled = () => + this.preferencesController.store.getState().useExternalNameSources; + this.nameController = new NameController({ messenger: this.controllerMessenger.getRestricted({ name: 'NameController', @@ -1548,9 +1551,9 @@ export default class MetamaskController extends EventEmitter { this.ensController, ), }), - new EtherscanNameProvider({}), - new TokenNameProvider({}), - new LensNameProvider(), + new EtherscanNameProvider({ isEnabled: isExternalNameSourcesEnabled }), + new TokenNameProvider({ isEnabled: isExternalNameSourcesEnabled }), + new LensNameProvider({ isEnabled: isExternalNameSourcesEnabled }), new SnapsNameProvider({ messenger: this.controllerMessenger.getRestricted({ name: 'SnapsNameProvider', @@ -2404,6 +2407,12 @@ export default class MetamaskController extends EventEmitter { preferencesController, ), ///: END:ONLY_INCLUDE_IN + ///: BEGIN:ONLY_INCLUDE_IN(petnames) + setUseExternalNameSources: + preferencesController.setUseExternalNameSources.bind( + preferencesController, + ), + ///: END:ONLY_INCLUDE_IN setIpfsGateway: preferencesController.setIpfsGateway.bind( preferencesController, ), diff --git a/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap b/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap index 6aabc18d4813..7c52b3c8e7cc 100644 --- a/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap +++ b/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap @@ -1313,6 +1313,81 @@ exports[`Security Tab should match snapshot 1`] = `
+ + Signature requests + +
+
+
+ + Suggest address names + +
+ We pull data from third parties like Etherscan, Infura, and Lens Protocol, to suggest names for addresses on signatures requests. Turning on name suggestions exposes your IP address to these third parties. +
+
+
+
+

+ + + Something doesn't look right? + + Contact us + + + + +

{details} + + {t('somethingDoesntLookRight', [ + + {t('contactUs')} + , + ])} + )} @@ -103,6 +118,9 @@ SecurityProviderBannerAlert.propTypes = { /** Name of the security provider */ provider: PropTypes.oneOf(Object.values(SecurityProvider)), + + /** Function to be called when the support link is clicked */ + onClickSupportLink: PropTypes.func, }; export default SecurityProviderBannerAlert; diff --git a/ui/components/app/signature-request/signature-request.js b/ui/components/app/signature-request/signature-request.js index d7146a304a0e..e5de3f67cca0 100644 --- a/ui/components/app/signature-request/signature-request.js +++ b/ui/components/app/signature-request/signature-request.js @@ -1,4 +1,11 @@ -import React, { useContext, useState, useEffect } from 'react'; +import React, { + useContext, + useState, + useEffect, + ///: BEGIN:ONLY_INCLUDE_IN(blockaid) + useCallback, + ///: END:ONLY_INCLUDE_IN +} from 'react'; import { useDispatch, useSelector, @@ -49,7 +56,7 @@ import ContractDetailsModal from '../modals/contract-details-modal'; import { MetaMetricsContext } from '../../../contexts/metametrics'; import { MetaMetricsEventCategory, - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi,blockaid) MetaMetricsEventName, ///: END:ONLY_INCLUDE_IN } from '../../../../shared/constants/metametrics'; @@ -155,6 +162,21 @@ const SignatureRequest = ({ txData }) => { return { sanitizedMessage, domain, primaryType }; }); + ///: BEGIN:ONLY_INCLUDE_IN(blockaid) + const onClickSupportLink = useCallback(() => { + trackEvent({ + category: MetaMetricsEventCategory.Transactions, + event: MetaMetricsEventName.ExternalLinkClicked, + properties: { + action: 'Sign Request', + type, + version, + external_link_clicked: 'security_alert_support_link', + }, + }); + }, []); + ///: END:ONLY_INCLUDE_IN + const onSign = async () => { ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) if (accountType === 'custody') { @@ -250,6 +272,7 @@ const SignatureRequest = ({ txData }) => { marginLeft={4} marginRight={4} marginBottom={4} + onClickSupportLink={onClickSupportLink} /> ///: END:ONLY_INCLUDE_IN } diff --git a/ui/components/app/transaction-alerts/transaction-alerts.js b/ui/components/app/transaction-alerts/transaction-alerts.js index c72d58bf1b68..f2ef032eab69 100644 --- a/ui/components/app/transaction-alerts/transaction-alerts.js +++ b/ui/components/app/transaction-alerts/transaction-alerts.js @@ -1,4 +1,9 @@ -import React from 'react'; +import React, { + ///: BEGIN:ONLY_INCLUDE_IN(blockaid) + useCallback, + useContext, + ///: END:ONLY_INCLUDE_IN +} from 'react'; import PropTypes from 'prop-types'; import { useSelector } from 'react-redux'; import { PriorityLevels } from '../../../../shared/constants/gas'; @@ -9,6 +14,9 @@ import { BannerAlert, ButtonLink, Text } from '../../component-library'; import SimulationErrorMessage from '../../ui/simulation-error-message'; import { SEVERITIES } from '../../../helpers/constants/design-system'; import ZENDESK_URLS from '../../../helpers/constants/zendesk-url'; +///: BEGIN:ONLY_INCLUDE_IN(blockaid) +import { MetaMetricsContext } from '../../../contexts/metametrics'; +///: END:ONLY_INCLUDE_IN import { isSuspiciousResponse } from '../../../../shared/modules/security-provider.utils'; ///: BEGIN:ONLY_INCLUDE_IN(blockaid) @@ -19,12 +27,18 @@ import { getNativeCurrency } from '../../../ducks/metamask/metamask'; import { TransactionType } from '../../../../shared/constants/transaction'; import { parseStandardTokenTransactionData } from '../../../../shared/modules/transaction.utils'; import { getTokenValueParam } from '../../../../shared/lib/metamask-controller-utils'; +import { + ///: BEGIN:ONLY_INCLUDE_IN(blockaid) + MetaMetricsEventCategory, + MetaMetricsEventName, + ///: END:ONLY_INCLUDE_IN +} from '../../../../shared/constants/metametrics'; const TransactionAlerts = ({ userAcknowledgedGasMissing, setUserAcknowledgedGasMissing, - txData, tokenSymbol, + txData, }) => { const { estimateUsed, hasSimulationError, supportsEIP1559, isNetworkBusy } = useGasFeeContext(); @@ -54,11 +68,30 @@ const TransactionAlerts = ({ hasProperTxType && (currentTokenAmount === '0x0' || currentTokenAmount === '0'); + ///: BEGIN:ONLY_INCLUDE_IN(blockaid) + const trackEvent = useContext(MetaMetricsContext); + ///: END:ONLY_INCLUDE_IN + + ///: BEGIN:ONLY_INCLUDE_IN(blockaid) + const onClickSupportLink = useCallback(() => { + trackEvent({ + category: MetaMetricsEventCategory.Transactions, + event: MetaMetricsEventName.ExternalLinkClicked, + properties: { + action: 'Confirm Screen', + origin: txData?.origin, + external_link_clicked: 'security_alert_support_link', + }, + }); + }, []); + ///: END:ONLY_INCLUDE_IN + return (
{ ///: BEGIN:ONLY_INCLUDE_IN(blockaid) ///: END:ONLY_INCLUDE_IN @@ -124,8 +157,8 @@ const TransactionAlerts = ({ TransactionAlerts.propTypes = { userAcknowledgedGasMissing: PropTypes.bool, setUserAcknowledgedGasMissing: PropTypes.func, - txData: PropTypes.object, tokenSymbol: PropTypes.string, + txData: PropTypes.object, }; export default TransactionAlerts; diff --git a/ui/helpers/constants/zendesk-url.js b/ui/helpers/constants/zendesk-url.js index 3599a27fd7de..73ec8ae7ab32 100644 --- a/ui/helpers/constants/zendesk-url.js +++ b/ui/helpers/constants/zendesk-url.js @@ -28,6 +28,7 @@ const ZENDESK_URLS = { 'https://metamask.zendesk.com/hc/en-us/articles/360059952212-MetaMask-is-a-non-custodial-wallet', SPEEDUP_CANCEL: 'https://metamask.zendesk.com/hc/en-us/articles/360015489251-How-to-speed-up-or-cancel-a-pending-transaction', + SUPPORT_URL: 'https://support.metamask.io/hc/en-us', TOKEN_ALLOWANCE_WITH_SPENDING_CAP: 'https://support.metamask.io/hc/en-us/articles/6055177143579-How-to-customize-token-approvals-with-a-spending-cap', TOKEN_SAFETY_PRACTICES: diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js index 6cd2da349f3b..6b8a8023c0a1 100644 --- a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js +++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js @@ -327,6 +327,7 @@ export default class ConfirmTransactionBase extends Component { useCurrencyRateCheck, tokenSymbol, } = this.props; + const { t } = this.context; const { userAcknowledgedGasMissing } = this.state; From 8013e24c1c5683e23825d345eac0c9776527ad72 Mon Sep 17 00:00:00 2001 From: Michele Esposito <34438276+mikesposito@users.noreply.github.com> Date: Wed, 4 Oct 2023 17:46:08 +0200 Subject: [PATCH 046/219] Rename `coreKeyringController` to `keyringController` (#21141) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** When migrating from `@metamask/eth-keyring-controller` to `@metamask/keyring-controller`, as we had to migrate all the interactions in different PRs (and potentially different releases), we needed a way to use both at the same time: this led to having `MetamaskController.keyringController` (old) and `MetamaskController.coreKeyringController` (new). As all interactions have been migrated and `@metamask/eth-keyring-controller` is no longer used, we can rename all `coreKeyringController` variables to `keyringController`, to match all the other controllers. Nothing should be changed in terms of functionality ## **Related issues** * Fixes #20511 ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [x] I’ve indicated what issue this PR is linked to: Fixes #??? - [x] I’ve included tests if applicable. - [x] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [x] I’ve properly set the pull request status: - [x] In case it's not yet "ready for review", I've set it to "draft". - [x] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- app/scripts/lib/snap-keyring/snap-keyring.ts | 12 +- .../metamask-controller.actions.test.js | 4 +- app/scripts/metamask-controller.js | 143 ++++++++---------- app/scripts/metamask-controller.test.js | 63 ++++---- 4 files changed, 102 insertions(+), 120 deletions(-) diff --git a/app/scripts/lib/snap-keyring/snap-keyring.ts b/app/scripts/lib/snap-keyring/snap-keyring.ts index 26ab295cffe1..a197c2b16690 100644 --- a/app/scripts/lib/snap-keyring/snap-keyring.ts +++ b/app/scripts/lib/snap-keyring/snap-keyring.ts @@ -29,7 +29,7 @@ export const getAccountsBySnapId = async ( * * @param getSnapController - A function that retrieves the Snap Controller instance. * @param getApprovalController - A function that retrieves the Approval Controller instance. - * @param getCoreKeyringController - A function that retrieves the Core Keyring Controller instance. + * @param getKeyringController - A function that retrieves the Keyring Controller instance. * @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. @@ -39,17 +39,17 @@ export const getAccountsBySnapId = async ( export const snapKeyringBuilder = ( getSnapController: () => SnapController, getApprovalController: () => ApprovalController, - getCoreKeyringController: () => KeyringController, + getKeyringController: () => KeyringController, removeAccountHelper: (address: string) => Promise, ) => { const builder = (() => { return new SnapKeyring(getSnapController() as any, { addressExists: async (address) => { - const addresses = await getCoreKeyringController().getAccounts(); + const addresses = await getKeyringController().getAccounts(); return addresses.includes(address.toLowerCase()); }, saveState: async () => { - await getCoreKeyringController().persistAllKeyrings(); + await getKeyringController().persistAllKeyrings(); }, addAccount: async ( _address: string, @@ -75,7 +75,7 @@ export const snapKeyringBuilder = ( if (confirmationResult) { try { await handleUserInput(confirmationResult); - await getCoreKeyringController().persistAllKeyrings(); + await getKeyringController().persistAllKeyrings(); await getApprovalController().success({ message: t('snapAccountCreated') ?? 'Your account is ready!', header: [snapAuthorshipHeader], @@ -127,7 +127,7 @@ export const snapKeyringBuilder = ( try { await removeAccountHelper(address); await handleUserInput(confirmationResult); - await getCoreKeyringController().persistAllKeyrings(); + await getKeyringController().persistAllKeyrings(); await getApprovalController().success({ message: t('snapAccountRemoved') ?? 'Account removed', header: [snapAuthorshipHeader], diff --git a/app/scripts/metamask-controller.actions.test.js b/app/scripts/metamask-controller.actions.test.js index d0439e48c01e..cee3455bfe5c 100644 --- a/app/scripts/metamask-controller.actions.test.js +++ b/app/scripts/metamask-controller.actions.test.js @@ -177,7 +177,7 @@ describe('MetaMaskController', function () { ]), Promise.resolve(1).then(() => { keyringControllerState1 = JSON.stringify( - metamaskController.coreKeyringController.state, + metamaskController.keyringController.state, ); metamaskController.importAccountWithStrategy('privateKey', [ importPrivkey, @@ -185,7 +185,7 @@ describe('MetaMaskController', function () { }), Promise.resolve(2).then(() => { keyringControllerState2 = JSON.stringify( - metamaskController.coreKeyringController.state, + metamaskController.keyringController.state, ); }), ]); diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index a3c3e7c9e479..fdf6203fbe6c 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -884,13 +884,13 @@ export default class MetamaskController extends EventEmitter { ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) const getSnapController = () => this.snapController; const getApprovalController = () => this.approvalController; - const getCoreKeyringController = () => this.coreKeyringController; + const getKeyringController = () => this.keyringController; additionalKeyrings.push( snapKeyringBuilder( getSnapController, getApprovalController, - getCoreKeyringController, + getKeyringController, (address) => this.removeAccount(address), ), ); @@ -919,7 +919,7 @@ export default class MetamaskController extends EventEmitter { ], }); - this.coreKeyringController = new KeyringController({ + this.keyringController = new KeyringController({ keyringBuilders: additionalKeyrings, state: initState.KeyringController, encryptor: opts.encryptor || undefined, @@ -976,8 +976,8 @@ export default class MetamaskController extends EventEmitter { permissionSpecifications: { ...getPermissionSpecifications({ getIdentities, - getAllAccounts: this.coreKeyringController.getAccounts.bind( - this.coreKeyringController, + getAllAccounts: this.keyringController.getAccounts.bind( + this.keyringController, ), captureKeyringTypesWithMissingIdentities: ( identities = {}, @@ -988,7 +988,7 @@ export default class MetamaskController extends EventEmitter { ); const keyringTypesWithMissingIdentities = accountsMissingIdentities.map((address) => - this.coreKeyringController.getAccountKeyringType(address), + this.keyringController.getAccountKeyringType(address), ); const identitiesCount = Object.keys(identities || {}).length; @@ -1274,8 +1274,8 @@ export default class MetamaskController extends EventEmitter { this.networkController.state.providerConfig.chainId, preferencesStore: this.preferencesController.store, txHistoryLimit: 60, - signTransaction: this.coreKeyringController.signTransaction.bind( - this.coreKeyringController, + signTransaction: this.keyringController.signTransaction.bind( + this.keyringController, ), provider: this.provider, blockTracker: this.blockTracker, @@ -1427,7 +1427,7 @@ export default class MetamaskController extends EventEmitter { `${this.approvalController.name}:addRequest`, `${this.approvalController.name}:acceptRequest`, `${this.approvalController.name}:rejectRequest`, - `${this.coreKeyringController.name}:decryptMessage`, + `${this.keyringController.name}:decryptMessage`, ], }), metricsEvent: this.metaMetricsController.trackEvent.bind( @@ -1445,13 +1445,12 @@ export default class MetamaskController extends EventEmitter { ], }), getEncryptionPublicKey: - this.coreKeyringController.getEncryptionPublicKey.bind( - this.coreKeyringController, - ), - getAccountKeyringType: - this.coreKeyringController.getAccountKeyringType.bind( - this.coreKeyringController, + this.keyringController.getEncryptionPublicKey.bind( + this.keyringController, ), + getAccountKeyringType: this.keyringController.getAccountKeyringType.bind( + this.keyringController, + ), getState: this.getState.bind(this), metricsEvent: this.metaMetricsController.trackEvent.bind( this.metaMetricsController, @@ -1463,9 +1462,9 @@ export default class MetamaskController extends EventEmitter { name: 'SignatureController', allowedActions: [ `${this.approvalController.name}:addRequest`, - `${this.coreKeyringController.name}:signMessage`, - `${this.coreKeyringController.name}:signPersonalMessage`, - `${this.coreKeyringController.name}:signTypedMessage`, + `${this.keyringController.name}:signMessage`, + `${this.keyringController.name}:signPersonalMessage`, + `${this.keyringController.name}:signTypedMessage`, ], }), isEthSignEnabled: () => @@ -1494,7 +1493,7 @@ export default class MetamaskController extends EventEmitter { ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) this.mmiController = new MMIController({ mmiConfigurationController: this.mmiConfigurationController, - keyringController: this.coreKeyringController, + keyringController: this.keyringController, txController: this.txController, securityProviderRequest: this.securityProviderRequest.bind(this), preferencesController: this.preferencesController, @@ -1772,7 +1771,7 @@ export default class MetamaskController extends EventEmitter { AppStateController: this.appStateController.store, AppMetadataController: this.appMetadataController.store, TransactionController: this.txController.store, - KeyringController: this.coreKeyringController, + KeyringController: this.keyringController, PreferencesController: this.preferencesController.store, MetaMetricsController: this.metaMetricsController.store, AddressBookController: this.addressBookController, @@ -1824,7 +1823,7 @@ export default class MetamaskController extends EventEmitter { AppMetadataController: this.appMetadataController.store, NetworkController: this.networkController, CachedBalancesController: this.cachedBalancesController.store, - KeyringController: this.coreKeyringController, + KeyringController: this.keyringController, PreferencesController: this.preferencesController.store, MetaMetricsController: this.metaMetricsController.store, AddressBookController: this.addressBookController, @@ -1971,11 +1970,11 @@ export default class MetamaskController extends EventEmitter { * @returns {SnapKeyring} */ async getSnapKeyring() { - let [snapKeyring] = this.coreKeyringController.getKeyringsByType( + let [snapKeyring] = this.keyringController.getKeyringsByType( KeyringType.snap, ); if (!snapKeyring) { - snapKeyring = await this.coreKeyringController.addNewKeyring( + snapKeyring = await this.keyringController.addNewKeyring( KeyringType.snap, ); } @@ -2339,7 +2338,7 @@ export default class MetamaskController extends EventEmitter { * @returns {object} status */ getState() { - const { vault } = this.coreKeyringController.state; + const { vault } = this.keyringController.state; const isInitialized = Boolean(vault); const flatState = this.memStore.getFlatState(); @@ -2375,7 +2374,7 @@ export default class MetamaskController extends EventEmitter { addressBookController, alertController, appStateController, - coreKeyringController, + keyringController, nftController, nftDetectionController, currencyRateController, @@ -2508,17 +2507,15 @@ export default class MetamaskController extends EventEmitter { // qr hardware devices submitQRHardwareCryptoHDKey: - coreKeyringController.submitQRCryptoHDKey.bind(coreKeyringController), + keyringController.submitQRCryptoHDKey.bind(keyringController), submitQRHardwareCryptoAccount: - coreKeyringController.submitQRCryptoAccount.bind(coreKeyringController), - cancelSyncQRHardware: coreKeyringController.cancelQRSynchronization.bind( - coreKeyringController, - ), - submitQRHardwareSignature: coreKeyringController.submitQRSignature.bind( - coreKeyringController, - ), + keyringController.submitQRCryptoAccount.bind(keyringController), + cancelSyncQRHardware: + keyringController.cancelQRSynchronization.bind(keyringController), + submitQRHardwareSignature: + keyringController.submitQRSignature.bind(keyringController), cancelQRHardwareSignRequest: - coreKeyringController.cancelQRSignRequest.bind(coreKeyringController), + keyringController.cancelQRSignRequest.bind(keyringController), // vault management submitPassword: this.submitPassword.bind(this), @@ -3006,7 +3003,7 @@ export default class MetamaskController extends EventEmitter { async exportAccount(address, password) { await this.verifyPassword(password); - return this.coreKeyringController.exportAccount(password, address); + return this.keyringController.exportAccount(password, address); } async getTokenStandardAndDetails(address, userAddress, tokenId) { @@ -3103,11 +3100,11 @@ export default class MetamaskController extends EventEmitter { async createNewVaultAndKeychain(password) { const releaseLock = await this.createVaultMutex.acquire(); try { - const vault = await this.coreKeyringController.createNewVaultAndKeychain( + const vault = await this.keyringController.createNewVaultAndKeychain( password, ); - const accounts = await this.coreKeyringController.getAccounts(); + const accounts = await this.keyringController.getAccounts(); this.preferencesController.setAddresses(accounts); this.selectFirstIdentity(); @@ -3154,13 +3151,13 @@ export default class MetamaskController extends EventEmitter { this.txController.txStateManager.clearUnapprovedTxs(); // create new vault - const vault = await this.coreKeyringController.createNewVaultAndRestore( + const vault = await this.keyringController.createNewVaultAndRestore( password, this._convertMnemonicToWordlistIndices(seedPhraseAsBuffer), ); const ethQuery = new EthQuery(this.provider); - accounts = await this.coreKeyringController.getAccounts(); + accounts = await this.keyringController.getAccounts(); lastBalance = await this.getBalance( accounts[accounts.length - 1], ethQuery, @@ -3169,15 +3166,15 @@ export default class MetamaskController extends EventEmitter { // seek out the first zero balance while (lastBalance !== '0x0') { const { addedAccountAddress } = - await this.coreKeyringController.addNewAccount(accounts.length); - accounts = await this.coreKeyringController.getAccounts(); + await this.keyringController.addNewAccount(accounts.length); + accounts = await this.keyringController.getAccounts(); lastBalance = await this.getBalance(addedAccountAddress, ethQuery); } // remove extra zero balance account potentially created from seeking ahead if (accounts.length > 1 && lastBalance === '0x0') { await this.removeAccount(accounts[accounts.length - 1]); - accounts = await this.coreKeyringController.getAccounts(); + accounts = await this.keyringController.getAccounts(); } // This must be set as soon as possible to communicate to the @@ -3257,7 +3254,7 @@ export default class MetamaskController extends EventEmitter { * @param {string} password - The user's password */ async submitPassword(password) { - await this.coreKeyringController.submitPassword(password); + await this.keyringController.submitPassword(password); ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) this.mmiController.onSubmitPassword(); @@ -3315,7 +3312,7 @@ export default class MetamaskController extends EventEmitter { const { loginToken, loginSalt } = await this.extension.storage.session.get(['loginToken', 'loginSalt']); if (loginToken && loginSalt) { - const { vault } = this.coreKeyringController.state; + const { vault } = this.keyringController.state; const jsonVault = JSON.parse(vault); @@ -3327,10 +3324,7 @@ export default class MetamaskController extends EventEmitter { return; } - await this.coreKeyringController.submitEncryptionKey( - loginToken, - loginSalt, - ); + await this.keyringController.submitEncryptionKey(loginToken, loginSalt); } } catch (e) { // If somehow this login token doesn't work properly, @@ -3350,7 +3344,7 @@ export default class MetamaskController extends EventEmitter { * @param {string} password - The user's password */ async verifyPassword(password) { - await this.coreKeyringController.verifyPassword(password); + await this.keyringController.verifyPassword(password); } /** @@ -3373,7 +3367,7 @@ export default class MetamaskController extends EventEmitter { * Gets the mnemonic of the user's primary keyring. */ getPrimaryKeyringMnemonic() { - const [keyring] = this.coreKeyringController.getKeyringsByType( + const [keyring] = this.keyringController.getKeyringsByType( KeyringType.hdKeyTree, ); if (!keyring.mnemonic) { @@ -3388,8 +3382,7 @@ export default class MetamaskController extends EventEmitter { const custodyType = this.custodyController.getCustodyTypeByAddress( toChecksumHexAddress(address), ); - const keyring = - this.coreKeyringController.getKeyringsByType(custodyType)[0]; + const keyring = this.keyringController.getKeyringsByType(custodyType)[0]; return keyring?.getAccountDetails(address) ? keyring : undefined; } ///: END:ONLY_INCLUDE_IN @@ -3426,11 +3419,9 @@ export default class MetamaskController extends EventEmitter { 'MetamaskController:getKeyringForDevice - Unknown device', ); } - let [keyring] = await this.coreKeyringController.getKeyringsByType( - keyringName, - ); + let [keyring] = await this.keyringController.getKeyringsByType(keyringName); if (!keyring) { - keyring = await this.coreKeyringController.addNewKeyring(keyringName); + keyring = await this.keyringController.addNewKeyring(keyringName); } if (hdPath && keyring.setHdPath) { keyring.setHdPath(hdPath); @@ -3484,7 +3475,7 @@ export default class MetamaskController extends EventEmitter { // Merge with existing accounts // and make sure addresses are not repeated - const oldAccounts = await this.coreKeyringController.getAccounts(); + const oldAccounts = await this.keyringController.getAccounts(); const accountsToTrack = [ ...new Set( oldAccounts.concat(accounts.map((a) => a.address.toLowerCase())), @@ -3526,7 +3517,7 @@ export default class MetamaskController extends EventEmitter { * @returns {'hardware' | 'imported' | 'MetaMask'} */ async getAccountType(address) { - const keyringType = await this.coreKeyringController.getAccountKeyringType( + const keyringType = await this.keyringController.getAccountKeyringType( address, ); switch (keyringType) { @@ -3551,9 +3542,7 @@ export default class MetamaskController extends EventEmitter { * @returns {'ledger' | 'lattice' | 'N/A' | string} */ async getDeviceModel(address) { - const keyring = await this.coreKeyringController.getKeyringForAccount( - address, - ); + const keyring = await this.keyringController.getKeyringForAccount(address); switch (keyring.type) { case KeyringType.trezor: return keyring.getModel(); @@ -3600,11 +3589,11 @@ export default class MetamaskController extends EventEmitter { const keyring = await this.getKeyringForDevice(deviceName, hdPath); keyring.setAccountToUnlock(index); - const oldAccounts = await this.coreKeyringController.getAccounts(); - const keyState = await this.coreKeyringController.addNewAccountForKeyring( + const oldAccounts = await this.keyringController.getAccounts(); + const keyState = await this.keyringController.addNewAccountForKeyring( keyring, ); - const newAccounts = await this.coreKeyringController.getAccounts(); + const newAccounts = await this.keyringController.getAccounts(); this.preferencesController.setAddresses(newAccounts); newAccounts.forEach((address) => { if (!oldAccounts.includes(address)) { @@ -3644,10 +3633,11 @@ export default class MetamaskController extends EventEmitter { await new Promise((resolve) => setTimeout(resolve, 5_000)); } - const oldAccounts = await this.coreKeyringController.getAccounts(); + const oldAccounts = await this.keyringController.getAccounts(); - const { addedAccountAddress } = - await this.coreKeyringController.addNewAccount(accountCount); + const { addedAccountAddress } = await this.keyringController.addNewAccount( + accountCount, + ); if (!oldAccounts.includes(addedAccountAddress)) { this.preferencesController.setSelectedAddress(addedAccountAddress); @@ -3668,7 +3658,7 @@ export default class MetamaskController extends EventEmitter { */ async verifySeedPhrase() { return this._convertEnglishWordlistIndicesToCodepoints( - await this.coreKeyringController.verifySeedPhrase(), + await this.keyringController.verifySeedPhrase(), ); } @@ -3749,11 +3739,9 @@ export default class MetamaskController extends EventEmitter { this.custodyController.removeAccount(address); ///: END:ONLY_INCLUDE_IN(build-mmi) - const keyring = await this.coreKeyringController.getKeyringForAccount( - address, - ); + const keyring = await this.keyringController.getKeyringForAccount(address); // Remove account from the keyring - await this.coreKeyringController.removeAccount(address); + await this.keyringController.removeAccount(address); const updatedKeyringAccounts = keyring ? await keyring.getAccounts() : {}; if (updatedKeyringAccounts?.length === 0) { keyring.destroy?.(); @@ -3772,10 +3760,7 @@ export default class MetamaskController extends EventEmitter { */ async importAccountWithStrategy(strategy, args) { const { importedAccountAddress } = - await this.coreKeyringController.importAccountWithStrategy( - strategy, - args, - ); + await this.keyringController.importAccountWithStrategy(strategy, args); // set new account as selected this.preferencesController.setSelectedAddress(importedAccountAddress); } @@ -4712,7 +4697,7 @@ export default class MetamaskController extends EventEmitter { * @returns {boolean} Whether the extension is unlocked. */ isUnlocked() { - return this.coreKeyringController.state.isUnlocked; + return this.keyringController.state.isUnlocked; } //============================================================================= @@ -4902,7 +4887,7 @@ export default class MetamaskController extends EventEmitter { * Locks MetaMask */ setLocked() { - const [trezorKeyring] = this.coreKeyringController.getKeyringsByType( + const [trezorKeyring] = this.keyringController.getKeyringsByType( KeyringType.trezor, ); if (trezorKeyring) { @@ -4913,7 +4898,7 @@ export default class MetamaskController extends EventEmitter { this.clearLoginArtifacts(); } - return this.coreKeyringController.setLocked(); + return this.keyringController.setLocked(); } removePermissionsFor = (subjects) => { diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js index 6cd7bfc51095..2a62d2097bb9 100644 --- a/app/scripts/metamask-controller.test.js +++ b/app/scripts/metamask-controller.test.js @@ -320,11 +320,11 @@ describe('MetaMaskController', () => { }); jest.spyOn( - metamaskController.coreKeyringController, + metamaskController.keyringController, 'createNewVaultAndKeychain', ); jest.spyOn( - metamaskController.coreKeyringController, + metamaskController.keyringController, 'createNewVaultAndRestore', ); jest @@ -409,9 +409,9 @@ describe('MetaMaskController', () => { ]); }); - it('adds private key to keyrings in core KeyringController', async () => { + it('adds private key to keyrings in KeyringController', async () => { const simpleKeyrings = - metamaskController.coreKeyringController.getKeyringsByType( + metamaskController.keyringController.getKeyringsByType( KeyringType.imported, ); const pubAddressHexArr = await simpleKeyrings[0].getAccounts(); @@ -426,7 +426,7 @@ describe('MetaMaskController', () => { it('adds 1 account', async () => { const keyringAccounts = - await metamaskController.coreKeyringController.getAccounts(); + await metamaskController.keyringController.getAccounts(); expect(keyringAccounts[keyringAccounts.length - 1]).toStrictEqual( '0xe18035bf8712672935fdb4e5e431b1a0183d2dfc', ); @@ -446,7 +446,7 @@ describe('MetaMaskController', () => { metamaskController.preferencesController.store.getState().identities, ); const addresses = - await metamaskController.coreKeyringController.getAccounts(); + await metamaskController.keyringController.getAccounts(); identities.forEach((identity) => { expect(addresses).toContain(identity); @@ -460,15 +460,15 @@ describe('MetaMaskController', () => { describe('setLocked', () => { it('should lock KeyringController', async () => { - jest.spyOn(metamaskController.coreKeyringController, 'setLocked'); + jest.spyOn(metamaskController.keyringController, 'setLocked'); await metamaskController.setLocked(); expect( - metamaskController.coreKeyringController.setLocked, + metamaskController.keyringController.setLocked, ).toHaveBeenCalled(); expect( - metamaskController.coreKeyringController.state.isUnlocked, + metamaskController.keyringController.state.isUnlocked, ).toStrictEqual(false); }); }); @@ -500,7 +500,7 @@ describe('MetaMaskController', () => { await metamaskController.createNewVaultAndRestore(password, TEST_SEED); expect( - metamaskController.coreKeyringController.createNewVaultAndRestore, + metamaskController.keyringController.createNewVaultAndRestore, ).toHaveBeenCalledTimes(2); }); @@ -686,31 +686,31 @@ describe('MetaMaskController', () => { }); it('should add the Trezor Hardware keyring', async () => { - jest.spyOn(metamaskController.coreKeyringController, 'addNewKeyring'); + jest.spyOn(metamaskController.keyringController, 'addNewKeyring'); await metamaskController .connectHardware(HardwareDeviceNames.trezor, 0) .catch(() => null); const keyrings = - await metamaskController.coreKeyringController.getKeyringsByType( + await metamaskController.keyringController.getKeyringsByType( KeyringType.trezor, ); expect( - metamaskController.coreKeyringController.addNewKeyring, + metamaskController.keyringController.addNewKeyring, ).toHaveBeenCalledWith(KeyringType.trezor); expect(keyrings).toHaveLength(1); }); it('should add the Ledger Hardware keyring', async () => { - jest.spyOn(metamaskController.coreKeyringController, 'addNewKeyring'); + jest.spyOn(metamaskController.keyringController, 'addNewKeyring'); await metamaskController .connectHardware(HardwareDeviceNames.ledger, 0) .catch(() => null); const keyrings = - await metamaskController.coreKeyringController.getKeyringsByType( + await metamaskController.keyringController.getKeyringsByType( KeyringType.ledger, ); expect( - metamaskController.coreKeyringController.addNewKeyring, + metamaskController.keyringController.addNewKeyring, ).toHaveBeenCalledWith(KeyringType.ledger); expect(keyrings).toHaveLength(1); }); @@ -732,7 +732,7 @@ describe('MetaMaskController', () => { mnemonic: uint8ArrayMnemonic, }; jest - .spyOn(metamaskController.coreKeyringController, 'getKeyringsByType') + .spyOn(metamaskController.keyringController, 'getKeyringsByType') .mockReturnValue([mockHDKeyring]); const recoveredMnemonic = @@ -780,7 +780,7 @@ describe('MetaMaskController', () => { .catch(() => null); await metamaskController.forgetDevice(HardwareDeviceNames.trezor); const keyrings = - await metamaskController.coreKeyringController.getKeyringsByType( + await metamaskController.keyringController.getKeyringsByType( KeyringType.trezor, ); @@ -793,20 +793,20 @@ describe('MetaMaskController', () => { describe('unlockHardwareWalletAccount', () => { const accountToUnlock = 10; beforeEach(async () => { - await metamaskController.coreKeyringController.createNewVaultAndRestore( + await metamaskController.keyringController.createNewVaultAndRestore( 'password', TEST_SEED, ); jest.spyOn(window, 'open').mockReturnValue(); jest .spyOn( - metamaskController.coreKeyringController, + metamaskController.keyringController, 'addNewAccountForKeyring', ) .mockReturnValue('0x123'); jest - .spyOn(metamaskController.coreKeyringController, 'getAccounts') + .spyOn(metamaskController.keyringController, 'getAccounts') .mockResolvedValueOnce(['0x1']) .mockResolvedValueOnce(['0x2']) .mockResolvedValueOnce(['0x3']); @@ -829,7 +829,7 @@ describe('MetaMaskController', () => { it('should set unlockedAccount in the keyring', async () => { const keyrings = - await metamaskController.coreKeyringController.getKeyringsByType( + await metamaskController.keyringController.getKeyringsByType( KeyringType.trezor, ); expect(keyrings[0].unlockedAccount).toStrictEqual(accountToUnlock); @@ -837,13 +837,13 @@ describe('MetaMaskController', () => { it('should call keyringController.addNewAccount', async () => { expect( - metamaskController.coreKeyringController.addNewAccountForKeyring, + metamaskController.keyringController.addNewAccountForKeyring, ).toHaveBeenCalledTimes(1); }); it('should call keyringController.getAccounts', async () => { expect( - metamaskController.coreKeyringController.getAccounts, + metamaskController.keyringController.getAccounts, ).toHaveBeenCalledTimes(2); }); @@ -885,7 +885,7 @@ describe('MetaMaskController', () => { await metamaskController.createNewVaultAndKeychain('password'); await metamaskController.addNewAccount(1); const getAccounts = - await metamaskController.coreKeyringController.getAccounts(); + await metamaskController.keyringController.getAccounts(); expect(getAccounts).toHaveLength(2); }); }); @@ -944,17 +944,14 @@ describe('MetaMaskController', () => { destroy: jest.fn(), }; jest - .spyOn(metamaskController.coreKeyringController, 'removeAccount') + .spyOn(metamaskController.keyringController, 'removeAccount') .mockReturnValue(); jest .spyOn(metamaskController, 'removeAllAccountPermissions') .mockReturnValue(); jest - .spyOn( - metamaskController.coreKeyringController, - 'getKeyringForAccount', - ) + .spyOn(metamaskController.keyringController, 'getKeyringForAccount') .mockResolvedValue(mockKeyring); ret = await metamaskController.removeAccount(addressToRemove); @@ -962,7 +959,7 @@ describe('MetaMaskController', () => { it('should call keyringController.removeAccount', async () => { expect( - metamaskController.coreKeyringController.removeAccount, + metamaskController.keyringController.removeAccount, ).toHaveBeenCalledWith(addressToRemove); }); it('should call metamaskController.removeAllAccountPermissions', async () => { @@ -973,9 +970,9 @@ describe('MetaMaskController', () => { it('should return address', async () => { expect(ret).toStrictEqual('0x1'); }); - it('should call coreKeyringController.getKeyringForAccount', async () => { + it('should call keyringController.getKeyringForAccount', async () => { expect( - metamaskController.coreKeyringController.getKeyringForAccount, + metamaskController.keyringController.getKeyringForAccount, ).toHaveBeenCalledWith(addressToRemove); }); it('should call keyring.destroy', async () => { From 4c67c0630b1cd59e2791afeda0729d32cbfea7e4 Mon Sep 17 00:00:00 2001 From: jiexi Date: Wed, 4 Oct 2023 15:32:58 -0700 Subject: [PATCH 047/219] Fix TokenRatesController polling no longer starting automatically (#21197) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes bug with TokensRateController no longer starting automatically on instantiation and requiring explicit `start()` to be called. Also replaces `configure({disabled})` with `start()` or `stop()` ## **Manual testing steps** * Open wallet * Check privacy settings to ensure price conversion is enabled * Restart wallet * Click send * Select ERC-20 token * Enter some amount * See that there is a conversion amount * Visit privacy settings and disable price conversion * Click send * Select ERC-20 token * Enter some amount * See that there is NO conversion amount ## **Screenshots/Recordings** _If applicable, add screenshots and/or recordings to visualize the before and after of your change._ ### **Before** ![image](https://github.com/MetaMask/metamask-extension/assets/918701/e595db79-276c-409e-894a-ae1dc5ce56cd) ### **After** ![Screenshot 2023-10-04 at 2 46 38 PM](https://github.com/MetaMask/metamask-extension/assets/918701/0c46e5bb-3dfb-4186-973d-e0f81ff2dd2f) ## **Related issues** Fixes https://github.com/MetaMask/metamask-extension/pull/20916 ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [x] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [x] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [x] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- app/scripts/metamask-controller.js | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index fdf6203fbe6c..ba44d0374779 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -763,26 +763,23 @@ export default class MetamaskController extends EventEmitter { this.preferencesController.store, ), }, - { - disabled: - !this.preferencesController.store.getState().useCurrencyRateCheck, - }, + {}, initState.TokenRatesController, ); + if (this.preferencesController.store.getState().useCurrencyRateCheck) { + this.tokenRatesController.start(); + } + this.preferencesController.store.subscribe( previousValueComparator((prevState, currState) => { const { useCurrencyRateCheck: prevUseCurrencyRateCheck } = prevState; const { useCurrencyRateCheck: currUseCurrencyRateCheck } = currState; if (currUseCurrencyRateCheck && !prevUseCurrencyRateCheck) { this.currencyRateController.start(); - this.tokenRatesController.configure( - { disabled: false }, - false, - false, - ); + this.tokenRatesController.start(); } else if (!currUseCurrencyRateCheck && prevUseCurrencyRateCheck) { this.currencyRateController.stop(); - this.tokenRatesController.configure({ disabled: true }, false, false); + this.tokenRatesController.stop(); } }, this.preferencesController.store.getState()), ); From 945dc7f3d59624b853c65eeb995da1cf9f028bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= Date: Thu, 5 Oct 2023 07:35:19 +0100 Subject: [PATCH 048/219] [MMI] updates onboarding flow for MMI (#20905) Updates the amount of steps during onboarding for a MMI user, by reducing the number of screens one has to go through. Meaning the user will go from the Welcome screen to -> Create Password screen -> Pin Extension screen -> Continue to MMI screen. ## Pre-merge author checklist - [x] I've clearly explained: - [x] What problem this PR is solving - [x] How this problem was solved - [x] How reviewers can test my changes - [x] Sufficient automated test coverage has been added ## Pre-merge reviewer checklist - [x] Manual testing (e.g. pull and build branch, run in browser, test code being changed) - [ ] **IF** this PR fixes a bug in the release milestone, add this PR to the release milestone If further QA is required (e.g. new feature, complex testing steps, large refactor), add the `Extension QA Board` label. In this case, a QA Engineer approval will be be required. --------- Co-authored-by: MetaMask Bot Co-authored-by: Brad Decker --- app/_locales/en/messages.json | 30 + app/images/onboarding-mmi-pin-browser.svg | 112 ++++ lavamoat/browserify/mmi/policy.json | 26 +- test/e2e/metamask-ui.spec.js | 2 +- test/e2e/metrics/wallet-created.spec.js | 4 +- test/e2e/nft/remove-erc1155.spec.js | 2 +- test/e2e/nft/send-nft.spec.js | 2 +- test/e2e/nft/view-erc1155-details.spec.js | 2 +- test/e2e/tests/import-flow.spec.js | 2 +- test/e2e/tests/metamask-responsive-ui.spec.js | 2 +- test/e2e/tests/onboarding.spec.js | 4 +- ui/helpers/constants/routes.ts | 2 + .../onboarding-successful/index.scss | 9 + .../onboarding-successful.js | 50 ++ .../onboarding-successful.stories.js | 16 + .../onboarding-successful.test.js | 44 ++ .../pin-mmi-billboard/pin-mmi-billboard.js | 597 ++++++++++++++++++ .../create-password.test.js.snap | 28 +- .../create-password/create-password.js | 157 +++-- ui/pages/onboarding-flow/onboarding-flow.js | 16 + .../pin-extension/pin-extension.js | 172 +++-- ui/pages/onboarding-flow/welcome/welcome.js | 180 ++++-- .../onboarding-flow/welcome/welcome.test.js | 5 + 23 files changed, 1275 insertions(+), 189 deletions(-) create mode 100644 app/images/onboarding-mmi-pin-browser.svg create mode 100644 ui/pages/institutional/onboarding-successful/index.scss create mode 100644 ui/pages/institutional/onboarding-successful/onboarding-successful.js create mode 100644 ui/pages/institutional/onboarding-successful/onboarding-successful.stories.js create mode 100644 ui/pages/institutional/onboarding-successful/onboarding-successful.test.js create mode 100644 ui/pages/institutional/pin-mmi-billboard/pin-mmi-billboard.js diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 403be4d4f3fc..dfa10c9732aa 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -903,6 +903,9 @@ "continue": { "message": "Continue" }, + "continueMmiOnboarding": { + "message": "Continue MetaMask Institutional onboarding" + }, "contract": { "message": "Contract" }, @@ -1616,6 +1619,12 @@ "message": "Explore community-built Snaps to customize your web3 experience", "description": "Banner description displayed on Snaps list page in Settings when less than 6 Snaps is installed." }, + "extensionInsallCompleteDescription": { + "message": "Return to the MetaMask Institutional product onboarding to connect your custodial or self-custodial accounts." + }, + "extensionInsallCompleteTitle": { + "message": "Extension install complete" + }, "externalExtension": { "message": "External extension" }, @@ -2030,6 +2039,12 @@ "install": { "message": "Install" }, + "installExtension": { + "message": "Install extension" + }, + "installExtensionDescription": { + "message": "The institution-compliant version of the world's leading web3 wallet, MetaMask." + }, "installOrigin": { "message": "Install origin" }, @@ -2394,6 +2409,9 @@ "mmiNewNFTDetectedInNFTsTabMessage": { "message": "Let MetaMask Institutional automatically detect and display NFTs in your wallet." }, + "mmiPasswordSetupDetails": { + "message": "This password will unlock your MetaMask Institutional extension only." + }, "more": { "message": "more" }, @@ -3151,6 +3169,9 @@ "onboardingPinExtensionTitle": { "message": "Your MetaMask install is complete!" }, + "onboardingPinMmiExtensionLabel": { + "message": "Pin MetaMask Institutional" + }, "onboardingUsePhishingDetectionDescription": { "message": "Phishing detection alerts rely on communication with $1. jsDeliver will have access to your IP address. View $2.", "description": "The $1 is the word 'jsDeliver', from key 'jsDeliver' and $2 is the words Privacy Policy from key 'privacyMsg', both separated here so that it can be wrapped as a link" @@ -3217,6 +3238,9 @@ "password": { "message": "Password" }, + "passwordMmiTermsWarning": { + "message": "I understand that MetaMask Institutional cannot recover this password for me. $1" + }, "passwordNotLongEnough": { "message": "Password not long enough" }, @@ -3444,6 +3468,12 @@ "personalAddressDetected": { "message": "Personal address detected. Input the token contract address." }, + "pinExtensionDescription": { + "message": "Navigate to the extension menu and pin MetaMask Institutional for seamless access." + }, + "pinExtensionTitle": { + "message": "Pin extension" + }, "pleaseConfirm": { "message": "Please confirm" }, diff --git a/app/images/onboarding-mmi-pin-browser.svg b/app/images/onboarding-mmi-pin-browser.svg new file mode 100644 index 000000000000..93ca2b06b256 --- /dev/null +++ b/app/images/onboarding-mmi-pin-browser.svg @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index 98c26279a5b0..5881b79a589f 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -4984,32 +4984,8 @@ }, "react-responsive-carousel": { "globals": { - "HTMLElement": true, "addEventListener": true, - "clearTimeout": true, - "console.warn": true, - "document": true, - "getComputedStyle": true, - "removeEventListener": true, - "setTimeout": true - }, - "packages": { - "classnames": true, - "react": true, - "react-dom": true, - "react-responsive-carousel>react-easy-swipe": true - } - }, - "react-responsive-carousel>react-easy-swipe": { - "globals": { - "addEventListener": true, - "define": true, - "document.addEventListener": true, - "document.removeEventListener": true - }, - "packages": { - "prop-types": true, - "react": true + "removeEventListener": true } }, "react-router-dom": { diff --git a/test/e2e/metamask-ui.spec.js b/test/e2e/metamask-ui.spec.js index 86964698f907..a562fddf5bac 100644 --- a/test/e2e/metamask-ui.spec.js +++ b/test/e2e/metamask-ui.spec.js @@ -17,7 +17,7 @@ const Ganache = require('./ganache'); const ganacheServer = new Ganache(); const dappPort = 8080; -describe('MetaMask', function () { +describe('MetaMask @no-mmi', function () { let driver; let dappServer; let tokenAddress; diff --git a/test/e2e/metrics/wallet-created.spec.js b/test/e2e/metrics/wallet-created.spec.js index 17152df356fa..7f9979fd4086 100644 --- a/test/e2e/metrics/wallet-created.spec.js +++ b/test/e2e/metrics/wallet-created.spec.js @@ -48,8 +48,8 @@ async function mockSegment(mockServer) { ]; } -describe('Wallet Created Events', function () { - it('are sent when onboarding user who chooses to opt in metrics @no-mmi', async function () { +describe('Wallet Created Events @no-mmi', function () { + it('are sent when onboarding user who chooses to opt in metrics', async function () { await withFixtures( { fixtures: new FixtureBuilder({ onboarding: true }) diff --git a/test/e2e/nft/remove-erc1155.spec.js b/test/e2e/nft/remove-erc1155.spec.js index 377d7a592f33..7923277cc4d7 100644 --- a/test/e2e/nft/remove-erc1155.spec.js +++ b/test/e2e/nft/remove-erc1155.spec.js @@ -15,7 +15,7 @@ describe('Remove ERC1155 NFT', function () { ], }; - it('user should be able to remove ERC1155 NFT on details page', async function () { + it('user should be able to remove ERC1155 NFT on details page @no-mmi', async function () { await withFixtures( { dapp: true, diff --git a/test/e2e/nft/send-nft.spec.js b/test/e2e/nft/send-nft.spec.js index 63ff670d3d77..4ec37faf2728 100644 --- a/test/e2e/nft/send-nft.spec.js +++ b/test/e2e/nft/send-nft.spec.js @@ -15,7 +15,7 @@ describe('Send NFT', function () { ], }; - it('should be able to send ERC721 NFT', async function () { + it('should be able to send ERC721 NFT @no-mmi', async function () { await withFixtures( { dapp: true, diff --git a/test/e2e/nft/view-erc1155-details.spec.js b/test/e2e/nft/view-erc1155-details.spec.js index b782a82b3088..29794412cf10 100644 --- a/test/e2e/nft/view-erc1155-details.spec.js +++ b/test/e2e/nft/view-erc1155-details.spec.js @@ -15,7 +15,7 @@ describe('View ERC1155 NFT details', function () { ], }; - it('user should be able to view ERC1155 NFT details', async function () { + it('user should be able to view ERC1155 NFT details @no-mmi', async function () { await withFixtures( { dapp: true, diff --git a/test/e2e/tests/import-flow.spec.js b/test/e2e/tests/import-flow.spec.js index e92c8ffc2542..d19296cb121a 100644 --- a/test/e2e/tests/import-flow.spec.js +++ b/test/e2e/tests/import-flow.spec.js @@ -22,7 +22,7 @@ const ganacheOptions = { ], }; -describe('Import flow', function () { +describe('Import flow @no-mmi', function () { it('Import wallet using Secret Recovery Phrase', async function () { const testPassword = 'correct horse battery staple'; diff --git a/test/e2e/tests/metamask-responsive-ui.spec.js b/test/e2e/tests/metamask-responsive-ui.spec.js index 3e89d5e25ae6..414bede479c1 100644 --- a/test/e2e/tests/metamask-responsive-ui.spec.js +++ b/test/e2e/tests/metamask-responsive-ui.spec.js @@ -8,7 +8,7 @@ const { const FixtureBuilder = require('../fixture-builder'); describe('MetaMask Responsive UI', function () { - it('Creating a new wallet', async function () { + it('Creating a new wallet @no-mmi', async function () { const driverOptions = { openDevToolsForTabs: true }; await withFixtures( diff --git a/test/e2e/tests/onboarding.spec.js b/test/e2e/tests/onboarding.spec.js index c81e93520e7a..eed6643eec4c 100644 --- a/test/e2e/tests/onboarding.spec.js +++ b/test/e2e/tests/onboarding.spec.js @@ -14,7 +14,7 @@ const { } = require('../helpers'); const FixtureBuilder = require('../fixture-builder'); -describe('MetaMask onboarding', function () { +describe('MetaMask onboarding @no-mmi', function () { const testPassword = 'correct horse battery staple'; const wrongSeedPhrase = 'test test test test test test test test test test test test'; @@ -239,7 +239,7 @@ describe('MetaMask onboarding', function () { ); }); - it(`User can add custom network during onboarding`, async function () { + it('User can add custom network during onboarding', async function () { const networkName = 'Localhost 8546'; const networkUrl = 'http://127.0.0.1:8546'; const currencySymbol = 'ETH'; diff --git a/ui/helpers/constants/routes.ts b/ui/helpers/constants/routes.ts index 55075195d160..a415542d15aa 100644 --- a/ui/helpers/constants/routes.ts +++ b/ui/helpers/constants/routes.ts @@ -70,6 +70,7 @@ const ONBOARDING_REVIEW_SRP_ROUTE = '/onboarding/review-recovery-phrase'; const ONBOARDING_CONFIRM_SRP_ROUTE = '/onboarding/confirm-recovery-phrase'; const ONBOARDING_CREATE_PASSWORD_ROUTE = '/onboarding/create-password'; const ONBOARDING_COMPLETION_ROUTE = '/onboarding/completion'; +const MMI_ONBOARDING_COMPLETION_ROUTE = '/onboarding/account-completion'; const ONBOARDING_UNLOCK_ROUTE = '/onboarding/unlock'; const ONBOARDING_HELP_US_IMPROVE_ROUTE = '/onboarding/help-us-improve'; const ONBOARDING_IMPORT_WITH_SRP_ROUTE = @@ -276,6 +277,7 @@ export { ONBOARDING_CONFIRM_SRP_ROUTE, ONBOARDING_PRIVACY_SETTINGS_ROUTE, ONBOARDING_COMPLETION_ROUTE, + MMI_ONBOARDING_COMPLETION_ROUTE, ONBOARDING_UNLOCK_ROUTE, ONBOARDING_PIN_EXTENSION_ROUTE, ONBOARDING_WELCOME_ROUTE, diff --git a/ui/pages/institutional/onboarding-successful/index.scss b/ui/pages/institutional/onboarding-successful/index.scss new file mode 100644 index 000000000000..1ac17f93abcd --- /dev/null +++ b/ui/pages/institutional/onboarding-successful/index.scss @@ -0,0 +1,9 @@ +.onboarding-successful { + @include screen-sm-min { + display: flex; + flex-direction: column; + align-items: center; + } + + max-width: 600px; +} diff --git a/ui/pages/institutional/onboarding-successful/onboarding-successful.js b/ui/pages/institutional/onboarding-successful/onboarding-successful.js new file mode 100644 index 000000000000..c000f0b2474f --- /dev/null +++ b/ui/pages/institutional/onboarding-successful/onboarding-successful.js @@ -0,0 +1,50 @@ +import React from 'react'; +import { useDispatch, useSelector } from 'react-redux'; +import { Box, Text } from '../../../components/component-library'; +import Button from '../../../components/ui/button'; +import { + TextVariant, + TextAlign, + FontWeight, +} from '../../../helpers/constants/design-system'; +import { useI18nContext } from '../../../hooks/useI18nContext'; +import { setCompletedOnboarding } from '../../../store/actions'; +import { getMMIConfiguration } from '../../../selectors/institutional/selectors'; + +export default function OnboardingSuccessful() { + const t = useI18nContext(); + const dispatch = useDispatch(); + const { portfolio } = useSelector(getMMIConfiguration); + + return ( +
+ + + {t('extensionInsallCompleteTitle')} + + + {t('extensionInsallCompleteDescription')} + + + + + + +
+ ); +} diff --git a/ui/pages/institutional/onboarding-successful/onboarding-successful.stories.js b/ui/pages/institutional/onboarding-successful/onboarding-successful.stories.js new file mode 100644 index 000000000000..cd05a54b5926 --- /dev/null +++ b/ui/pages/institutional/onboarding-successful/onboarding-successful.stories.js @@ -0,0 +1,16 @@ +import React from 'react'; +import OnboardingSuccessful from './onboarding-successful'; + +export default { + title: 'Pages/Institutional/OnboardingSuccessful', +}; + +export const DefaultStory = () => { + return ( +
+ +
+ ); +}; + +DefaultStory.storyName = 'Default'; diff --git a/ui/pages/institutional/onboarding-successful/onboarding-successful.test.js b/ui/pages/institutional/onboarding-successful/onboarding-successful.test.js new file mode 100644 index 000000000000..304781a6881f --- /dev/null +++ b/ui/pages/institutional/onboarding-successful/onboarding-successful.test.js @@ -0,0 +1,44 @@ +import React from 'react'; +import configureMockStore from 'redux-mock-store'; +import thunk from 'redux-thunk'; +import { + renderWithProvider, + setBackgroundConnection, +} from '../../../../test/jest'; +import OnboardingSuccessful from './onboarding-successful'; + +const mockHistoryPush = jest.fn(); + +const completeOnboardingStub = jest + .fn() + .mockImplementation(() => Promise.resolve()); + +jest.mock('react-router-dom', () => ({ + ...jest.requireActual('react-router-dom'), + useHistory: () => ({ + push: mockHistoryPush, + }), +})); + +describe('Successful Onboarding View', () => { + const mockStore = { + metamask: { + providerConfig: { + type: 'test', + }, + }, + }; + const store = configureMockStore([thunk])(mockStore); + setBackgroundConnection({ completeOnboarding: completeOnboardingStub }); + + afterEach(() => { + jest.resetAllMocks(); + }); + + it('should render the onboarding-successful view', () => { + const { getByTestId } = renderWithProvider(, store); + const continueButton = getByTestId('onboarding-continue-button'); + expect(getByTestId('onboarding-successful')).toBeInTheDocument(); + expect(continueButton).toBeInTheDocument(); + }); +}); diff --git a/ui/pages/institutional/pin-mmi-billboard/pin-mmi-billboard.js b/ui/pages/institutional/pin-mmi-billboard/pin-mmi-billboard.js new file mode 100644 index 000000000000..008c5bf516b7 --- /dev/null +++ b/ui/pages/institutional/pin-mmi-billboard/pin-mmi-billboard.js @@ -0,0 +1,597 @@ +import React from 'react'; +import { useI18nContext } from '../../../hooks/useI18nContext'; + +export default function OnboardingPinMmiBillboard() { + const t = useI18nContext(); + + return ( + + + + + + + + {t('onboardingPinExtensionStep1')} + + + + + {t('onboardingPinExtensionChrome')} + + + + + + {t('onboardingPinExtensionStep2')} + + + + + {t('onboardingPinMmiExtensionLabel')} + + + + + + + + + + + + + + + + + + + {t('onboardingPinExtensionBillboardTitle')} + + + + + {t('onboardingPinExtensionBillboardAccess')} + + + + + {t('appNameMmi')} + + + + + {t('onboardingPinExtensionBillboardDescription')} + + + {t('onboardingPinExtensionBillboardDescription2')} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +} diff --git a/ui/pages/onboarding-flow/create-password/__snapshots__/create-password.test.js.snap b/ui/pages/onboarding-flow/create-password/__snapshots__/create-password.test.js.snap index 1fa2d9418da0..c7aa339afc5e 100644 --- a/ui/pages/onboarding-flow/create-password/__snapshots__/create-password.test.js.snap +++ b/ui/pages/onboarding-flow/create-password/__snapshots__/create-password.test.js.snap @@ -38,6 +38,7 @@ exports[`Onboarding Create Password Render should match snapshot 1`] = ` class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography typography--h4 typography--weight-normal typography--style-normal typography--align-center typography--color-text-default" > This password will unlock your MetaMask wallet only on this device. MetaMask can not recover this password. + This password will unlock your MetaMask Institutional extension only.
+ + ///: END:ONLY_INCLUDE_IN + } + + { + ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-flask) + + ? t('importMyWallet') + : t('createNewWallet')} + + ///: END:ONLY_INCLUDE_IN + } {shouldInjectMetametricsIframe ? ( diff --git a/ui/pages/onboarding-flow/onboarding-flow.js b/ui/pages/onboarding-flow/onboarding-flow.js index 12fe34b9648e..be6367277758 100644 --- a/ui/pages/onboarding-flow/onboarding-flow.js +++ b/ui/pages/onboarding-flow/onboarding-flow.js @@ -15,6 +15,9 @@ import { ONBOARDING_SECURE_YOUR_WALLET_ROUTE, ONBOARDING_PRIVACY_SETTINGS_ROUTE, ONBOARDING_COMPLETION_ROUTE, + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + MMI_ONBOARDING_COMPLETION_ROUTE, + ///: END:ONLY_INCLUDE_IN ONBOARDING_IMPORT_WITH_SRP_ROUTE, ONBOARDING_PIN_EXTENSION_ROUTE, ONBOARDING_METAMETRICS, @@ -37,6 +40,9 @@ import { ///: BEGIN:ONLY_INCLUDE_IN(build-flask) import ExperimentalArea from '../../components/app/flask/experimental-area'; ///: END:ONLY_INCLUDE_IN +///: BEGIN:ONLY_INCLUDE_IN(build-mmi) +import OnboardingSuccessful from '../institutional/onboarding-successful/onboarding-successful'; +///: END:ONLY_INCLUDE_IN import OnboardingFlowSwitch from './onboarding-flow-switch/onboarding-flow-switch'; import CreatePassword from './create-password/create-password'; import ReviewRecoveryPhrase from './recovery-phrase/review-recovery-phrase'; @@ -157,6 +163,16 @@ export default function OnboardingFlow() { path={ONBOARDING_COMPLETION_ROUTE} component={CreationSuccessful} /> + { + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + } + + { + ///: END:ONLY_INCLUDE_IN + } { if (selectedIndex === 0) { setSelectedIndex(1); @@ -48,61 +71,100 @@ export default function OnboardingPinExtension() { history.push(DEFAULT_ROUTE); } }; + ///: END:ONLY_INCLUDE_IN return (
- - {t('onboardingPinExtensionTitle')} - - setSelectedIndex(index)} - > -
- - {t('onboardingPinExtensionDescription')} + { + ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-flask) + <> + + {t('onboardingPinExtensionTitle')} -
- + setSelectedIndex(index)} + > +
+ + {t('onboardingPinExtensionDescription')} + +
+ +
+
+
+ + {t('onboardingPinExtensionDescription2')} + + + {t('onboardingPinExtensionDescription3')} + + +
+ +
+
-
-
- - {t('onboardingPinExtensionDescription2')} - - - {t('onboardingPinExtensionDescription3')} - - -
- -
- -
+ + ///: END:ONLY_INCLUDE_IN + } + + { + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + <> +
+ + + {t('pinExtensionTitle')} + + + {t('pinExtensionDescription')} + + + +
+
+ +
+ + ///: END:ONLY_INCLUDE_IN + }
); } diff --git a/ui/pages/onboarding-flow/welcome/welcome.js b/ui/pages/onboarding-flow/welcome/welcome.js index 1fd7f04c234a..673e0ac58746 100644 --- a/ui/pages/onboarding-flow/welcome/welcome.js +++ b/ui/pages/onboarding-flow/welcome/welcome.js @@ -2,17 +2,19 @@ import EventEmitter from 'events'; import React, { useState, useEffect, useContext } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import { useHistory } from 'react-router-dom'; +///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-flask) import { Carousel } from 'react-responsive-carousel'; +///: END:ONLY_INCLUDE_IN import Mascot from '../../../components/ui/mascot'; import Button from '../../../components/ui/button'; import { Text } from '../../../components/component-library'; import CheckBox from '../../../components/ui/check-box'; import Box from '../../../components/ui/box'; import { - FONT_WEIGHT, - TEXT_ALIGN, TextVariant, AlignItems, + TextAlign, + FontWeight, } from '../../../helpers/constants/design-system'; import { useI18nContext } from '../../../hooks/useI18nContext'; import { MetaMetricsContext } from '../../../contexts/metametrics'; @@ -23,11 +25,20 @@ import { import { setFirstTimeFlowType, setTermsOfUseLastAgreed, + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + setParticipateInMetaMetrics, + ///: END:ONLY_INCLUDE_IN } from '../../../store/actions'; import { + ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-flask) ONBOARDING_METAMETRICS, + ///: END:ONLY_INCLUDE_IN ONBOARDING_SECURE_YOUR_WALLET_ROUTE, ONBOARDING_COMPLETION_ROUTE, + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + ONBOARDING_CREATE_PASSWORD_ROUTE, + ONBOARDING_IMPORT_WITH_SRP_ROUTE, + ///: END:ONLY_INCLUDE_IN } from '../../../helpers/constants/routes'; import { FIRST_TIME_FLOW_TYPES } from '../../../helpers/constants/onboarding'; import { getFirstTimeFlowType, getCurrentKeyring } from '../../../selectors'; @@ -54,7 +65,7 @@ export default function OnboardingWelcome() { }, [currentKeyring, history, firstTimeFlowType]); const trackEvent = useContext(MetaMetricsContext); - const onCreateClick = () => { + const onCreateClick = async () => { dispatch(setFirstTimeFlowType('create')); trackEvent({ category: MetaMetricsEventCategory.Onboarding, @@ -64,7 +75,15 @@ export default function OnboardingWelcome() { }, }); dispatch(setTermsOfUseLastAgreed(new Date().getTime())); + + ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-flask) history.push(ONBOARDING_METAMETRICS); + ///: END:ONLY_INCLUDE_IN + + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + await dispatch(setParticipateInMetaMetrics(false)); + history.push(ONBOARDING_CREATE_PASSWORD_ROUTE); + ///: END:ONLY_INCLUDE_IN }; const toggleTermsCheck = () => { setTermsChecked((currentTermsChecked) => !currentTermsChecked); @@ -81,7 +100,7 @@ export default function OnboardingWelcome() { , ]); - const onImportClick = () => { + const onImportClick = async () => { dispatch(setFirstTimeFlowType('import')); trackEvent({ category: MetaMetricsEventCategory.Onboarding, @@ -91,23 +110,105 @@ export default function OnboardingWelcome() { }, }); dispatch(setTermsOfUseLastAgreed(new Date().getTime())); + + ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-flask) history.push(ONBOARDING_METAMETRICS); + ///: END:ONLY_INCLUDE_IN + + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + await dispatch(setParticipateInMetaMetrics(false)); + history.push(ONBOARDING_IMPORT_WITH_SRP_ROUTE); + ///: END:ONLY_INCLUDE_IN }; return (
- + { + ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-flask) + +
+ + {t('welcomeToMetaMask')} + + + {t('welcomeToMetaMaskIntro')} + +
+ +
+
+
+ + {t('welcomeExploreTitle')} + + + {t('welcomeExploreDescription')} + +
+ +
+
+
+ + {t('welcomeLoginTitle')} + + + {t('welcomeLoginDescription')} + +
+ +
+
+ + ///: END:ONLY_INCLUDE_IN + } + + { + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
- {t('welcomeToMetaMask')} + {t('installExtension')} - - {t('welcomeToMetaMaskIntro')} + + {t('installExtensionDescription')}
-
- - {t('welcomeExploreTitle')} - - - {t('welcomeExploreDescription')} - -
- -
-
-
- - {t('welcomeLoginTitle')} - - - {t('welcomeLoginDescription')} - -
- -
-
- + ///: END:ONLY_INCLUDE_IN + } +
  • - {t('onboardingCreateWallet')} + { + ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-flask) + t('onboardingCreateWallet') + ///: END:ONLY_INCLUDE_IN + } + { + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + t('continue') + ///: END:ONLY_INCLUDE_IN + }
  • diff --git a/ui/pages/onboarding-flow/welcome/welcome.test.js b/ui/pages/onboarding-flow/welcome/welcome.test.js index c7965efd52f4..a14e36a95c73 100644 --- a/ui/pages/onboarding-flow/welcome/welcome.test.js +++ b/ui/pages/onboarding-flow/welcome/welcome.test.js @@ -29,6 +29,11 @@ jest.mock('../../../store/actions.ts', () => ({ return type; }), ), + setParticipateInMetaMetrics: jest.fn().mockReturnValue( + jest.fn((type) => { + return type; + }), + ), })); jest.mock('react-router-dom', () => ({ From cffa2625112c80e9bc2ea024e007650a252ca060 Mon Sep 17 00:00:00 2001 From: Pritam Dhara <46365255+pritam1813@users.noreply.github.com> Date: Thu, 5 Oct 2023 21:49:06 +0530 Subject: [PATCH 049/219] Replaced ActionableMessage in Advanced Tab (#20900) ## Explanation - This PR fixes part of https://github.com/MetaMask/metamask-extension/issues/19528 - Replaces instances of `ActionableMessage` with `BannerAlert` in `ui/pages/settings/advanced-tab/advanced-tab.component.js` ## Screenshots/Screencaps ### Before ![before_success](https://github.com/MetaMask/metamask-extension/assets/46365255/624b4da9-0b59-4b83-b564-593b9c1328a8) ![before_danger](https://github.com/MetaMask/metamask-extension/assets/46365255/1549b1b7-88e9-4459-b1c1-7d39b2ddfa70) ### After ![after_success](https://github.com/MetaMask/metamask-extension/assets/46365255/41079132-ae02-48e5-afec-98b2fd22925b) ![after_danger](https://github.com/MetaMask/metamask-extension/assets/46365255/aeaad47a-9461-4942-bdd1-e9018167c6e5) ## Manual Testing Steps - Create build from this PR - From Menu go to Settings -> Advanced - Scroll Down to find **Restore user data** section. - Try Restoring with proper/corrupted file. ## Pre-merge author checklist - [x] I've clearly explained: - [x] What problem this PR is solving - [x] How this problem was solved - [x] How reviewers can test my changes - [ ] Sufficient automated test coverage has been added ## Pre-merge reviewer checklist - [ ] Manual testing (e.g. pull and build branch, run in browser, test code being changed) - [ ] PR is linked to the appropriate GitHub issue - [ ] **IF** this PR fixes a bug in the release milestone, add this PR to the release milestone If further QA is required (e.g. new feature, complex testing steps, large refactor), add the `Extension QA Board` label. In this case, a QA Engineer approval will be be required. --------- Co-authored-by: georgewrmarshall --- test/e2e/tests/backup-restore.spec.js | 2 +- .../advanced-tab/advanced-tab.component.js | 36 +++++++++++-------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/test/e2e/tests/backup-restore.spec.js b/test/e2e/tests/backup-restore.spec.js index dfba955c62a2..43690cbc1e2b 100644 --- a/test/e2e/tests/backup-restore.spec.js +++ b/test/e2e/tests/backup-restore.spec.js @@ -127,7 +127,7 @@ describe('Backup and Restore', function () { // Dismiss success message await driver.waitForSelector({ - css: '.actionable-message__message', + css: '[data-testid="restore-user-data-banner-alert-description"]', text: 'Your data has been restored successfully', }); await driver.clickElement({ text: 'Dismiss', tag: 'button' }); diff --git a/ui/pages/settings/advanced-tab/advanced-tab.component.js b/ui/pages/settings/advanced-tab/advanced-tab.component.js index eeda359ba7ef..a5c6c66f57c0 100644 --- a/ui/pages/settings/advanced-tab/advanced-tab.component.js +++ b/ui/pages/settings/advanced-tab/advanced-tab.component.js @@ -1,6 +1,10 @@ import React, { PureComponent } from 'react'; import PropTypes from 'prop-types'; -import { Box, BannerAlert } from '../../../components/component-library'; +import { + Box, + BannerAlert, + BannerAlertSeverity, +} from '../../../components/component-library'; import ToggleButton from '../../../components/ui/toggle-button'; import TextField from '../../../components/ui/text-field'; import Button from '../../../components/ui/button'; @@ -34,7 +38,6 @@ import { exportAsFile, ExportableContentType, } from '../../../helpers/utils/export-utils'; -import ActionableMessage from '../../../components/ui/actionable-message'; import ZENDESK_URLS from '../../../helpers/constants/zendesk-url'; const CORRUPT_JSON_FILE = 'CORRUPT_JSON_FILE'; @@ -748,18 +751,23 @@ export default class AdvancedTab extends PureComponent { />
{showResultMessage && ( - { - this.setState({ - showResultMessage: false, - restoreSuccessful: true, - restoreMessage: null, - }); - }, + { + this.setState({ + showResultMessage: false, + restoreSuccessful: true, + restoreMessage: null, + }); }} /> )} From ed257d58daa9d5517bdfb4bff93b3d98c0ef6995 Mon Sep 17 00:00:00 2001 From: jainex Date: Thu, 5 Oct 2023 21:58:06 +0530 Subject: [PATCH 050/219] Replacing dep Popover with Modal in EditGasPopover (#20453) ## Explanation This pull request addresses the issue of replacing the deprecated Popover component with the new Modal component in the `edit-gas-popover.component.js` file. ### Change Made - Replaced deprecated Popover component with the new Modal component. - Updated deprecated button component to the new button component. * Part of #19555 ## Screenshots/Screencaps ### Before https://github.com/MetaMask/metamask-extension/assets/81921291/0f175387-86de-4927-83bd-c3587bb5c17a ### After https://github.com/MetaMask/metamask-extension/assets/81921291/5cf6aa04-1340-46b8-a1e7-8440d89a5b87 ## Manual Testing Steps - Pull this branch - run storybook - search `EditGasPopover` ## Pre-merge author checklist - [x] I've clearly explained: - [x] What problem this PR is solving - [x] How this problem was solved - [x] How reviewers can test my changes - [x] Sufficient automated test coverage has been added ## Pre-merge reviewer checklist - [ ] Manual testing (e.g. pull and build branch, run in browser, test code being changed) - [ ] PR is linked to the appropriate GitHub issue - [ ] **IF** this PR fixes a bug in the release milestone, add this PR to the release milestone If further QA is required (e.g. new feature, complex testing steps, large refactor), add the `Extension QA Board` label. In this case, a QA Engineer approval will be be required. --------- Co-authored-by: georgewrmarshall --- ui/components/app/app-components.scss | 1 + .../edit-gas-popover.component.js | 78 +++++++++++-------- ui/components/app/edit-gas-popover/index.scss | 6 +- 3 files changed, 47 insertions(+), 38 deletions(-) diff --git a/ui/components/app/app-components.scss b/ui/components/app/app-components.scss index c5c610d5dc51..24bfd9146013 100644 --- a/ui/components/app/app-components.scss +++ b/ui/components/app/app-components.scss @@ -28,6 +28,7 @@ @import 'edit-gas-fee-popover/network-statistics/index'; @import 'edit-gas-fee-popover/network-statistics/status-slider/index'; @import 'edit-gas-fee-popover/edit-gas-tooltip/index'; +@import 'edit-gas-popover/index'; @import 'flask/experimental-area/index'; @import 'snaps/snap-content-footer/index'; @import 'snaps/snap-install-warning/index'; diff --git a/ui/components/app/edit-gas-popover/edit-gas-popover.component.js b/ui/components/app/edit-gas-popover/edit-gas-popover.component.js index a3b9920d3066..5a9b620aa546 100644 --- a/ui/components/app/edit-gas-popover/edit-gas-popover.component.js +++ b/ui/components/app/edit-gas-popover/edit-gas-popover.component.js @@ -10,8 +10,15 @@ import { GasRecommendations, } from '../../../../shared/constants/gas'; -import Popover from '../../ui/popover'; -import Button from '../../ui/button'; +import { + Modal, + ModalOverlay, + ModalContent, + ModalHeader, + Button, + ButtonVariant, + ButtonSize, +} from '../../component-library'; import EditGasDisplay from '../edit-gas-display'; import { I18nContext } from '../../../contexts/i18n'; @@ -170,44 +177,47 @@ export default function EditGasPopover({ const footerButtonText = confirmButtonText || t('save'); return ( - + + + + {title} + +
+ {process.env.IN_TEST ? null : } + +
- } - > -
- {process.env.IN_TEST ? null : } - -
- + + ); } diff --git a/ui/components/app/edit-gas-popover/index.scss b/ui/components/app/edit-gas-popover/index.scss index e81e9d382c7d..b6b4e8bdf362 100644 --- a/ui/components/app/edit-gas-popover/index.scss +++ b/ui/components/app/edit-gas-popover/index.scss @@ -1,7 +1,5 @@ .edit-gas-popover { - &__wrapper { - @include screen-sm-min { - max-height: 84vh; - } + &__edit-gas-display { + position: relative; } } From 49da737bb44bb13c0f42d80a47a36c2167dab49e Mon Sep 17 00:00:00 2001 From: Brad Decker Date: Thu, 5 Oct 2023 14:08:23 -0500 Subject: [PATCH 051/219] add audit exclusion for ethereum-cryptography (deprecation) (#21215) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** Adds the deprecation notice for old versions of ethereum-cryptography to our ignore list with instructions for how we could remove the exception in the future. ## **Manual testing steps** 1. run yarn audit or wait for CI to pass ### **Before** Screenshot 2023-10-05 at 10 48 17 AM ### **After** Screenshot 2023-10-05 at 10 49 45 AM ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [x] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [x] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [x] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- .yarnrc.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.yarnrc.yml b/.yarnrc.yml index eab0fabc76d6..5881cfe128a8 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -98,6 +98,14 @@ npmAuditIgnoreAdvisories: # by MetaMask - 'ripple-lib (deprecation)' + # Brought in by ethereumjs-utils, which is used in the extension and in many + # other dependencies. At the time of this exclusion, the extension has three + # old versions of ethereumjs-utils which should be upgraded to + # @ethereumjs/utils throughout our owned repositories. However even doing + # that may be insufficient due to dependencies we do not own still relying + # upon old versions of ethereumjs-utils. + - 'ethereum-cryptography (deprecation)' + npmRegistries: 'https://npm.pkg.github.com': npmAlwaysAuth: true From cb8aac64842424d1793e061a2acf39b4ea38afba Mon Sep 17 00:00:00 2001 From: Jyoti Puri Date: Fri, 6 Oct 2023 09:29:50 +0530 Subject: [PATCH 052/219] Fix next button key event handling on token approval page (#21214) --- ...sktop-enable-button.component.test.js.snap | 2 -- .../modal.component.test.js.snap | 16 --------------- .../confirm-delete-network.test.js.snap | 4 ---- .../confirm-remove-account.test.js.snap | 4 ---- .../confirm-reset-account.test.js.snap | 4 ---- .../customize-nonce.test.js.snap | 4 ---- ...hide-token-confirmation-modal.test.js.snap | 4 ---- .../reject-transactions.test.js.snap | 4 ---- .../transaction-confirmed.test.js.snap | 2 -- .../__snapshots__/nft-details.test.js.snap | 2 -- .../signature-request-original.test.js.snap | 4 ---- .../signature-request-siwe.test.js.snap | 4 ---- .../signature-request.test.js.snap | 8 -------- ...ction-breakdown-row.component.test.js.snap | 2 -- ui/components/ui/button/button.component.js | 2 +- ...ge-container-footer.component.test.js.snap | 8 -------- .../confirm-add-suggested-nft.test.js.snap | 8 -------- ...irm-decrypt-message.component.test.js.snap | 8 -------- ...cryption-public-key.component.test.js.snap | 8 -------- .../confirm-send-ether.test.js.snap | 4 ---- .../__snapshots__/index.test.js.snap | 4 ---- .../confirm-transaction-base.test.js.snap | 4 ---- .../add-ethereum-chain.test.js.snap | 4 ---- .../create-snap-account.test.js.snap | 4 ---- .../__snapshots__/error.test.js.snap | 2 -- .../remove-snap-account.test.js.snap | 4 ---- .../__snapshots__/success.test.js.snap | 2 -- .../switch-ethereum-chain.test.js.snap | 8 -------- .../__snapshots__/desktop-error.test.js.snap | 20 ------------------- .../add-network-modal.test.js.snap | 4 ---- .../create-password.test.js.snap | 4 ---- .../__snapshots__/metametrics.test.js.snap | 4 ---- .../review-recovery-phrase.test.js.snap | 4 ---- .../__snapshots__/send-footer.test.js.snap | 8 -------- .../advanced-tab.component.test.js.snap | 8 -------- .../experimental-tab.test.js.snap | 2 -- .../__snapshots__/swaps-footer.test.js.snap | 4 ---- .../token-allowance.test.js.snap | 4 ---- .../__snapshots__/unlock-page.test.js.snap | 2 -- 39 files changed, 1 insertion(+), 197 deletions(-) diff --git a/ui/components/app/desktop-enable-button/__snapshots__/desktop-enable-button.component.test.js.snap b/ui/components/app/desktop-enable-button/__snapshots__/desktop-enable-button.component.test.js.snap index de0fd70b8ea2..c26996423a3c 100644 --- a/ui/components/app/desktop-enable-button/__snapshots__/desktop-enable-button.component.test.js.snap +++ b/ui/components/app/desktop-enable-button/__snapshots__/desktop-enable-button.component.test.js.snap @@ -4,8 +4,6 @@ exports[`Desktop Enable Button should match snapshot 1`] = `
diff --git a/ui/components/app/modal/__snapshots__/modal.component.test.js.snap b/ui/components/app/modal/__snapshots__/modal.component.test.js.snap index afd63d7dc269..40d89b7594a7 100644 --- a/ui/components/app/modal/__snapshots__/modal.component.test.js.snap +++ b/ui/components/app/modal/__snapshots__/modal.component.test.js.snap @@ -13,15 +13,11 @@ exports[`Modal Component should render a modal with a cancel and a submit button > @@ -56,15 +52,11 @@ exports[`Modal Component should render a modal with a header 1`] = ` > @@ -109,15 +101,11 @@ exports[`Modal Component should render a modal with children 1`] = ` > @@ -139,15 +127,11 @@ exports[`Modal Component should render a modal with different button types 1`] = > diff --git a/ui/components/app/modals/confirm-delete-network/__snapshots__/confirm-delete-network.test.js.snap b/ui/components/app/modals/confirm-delete-network/__snapshots__/confirm-delete-network.test.js.snap index 07bc3f75dc5c..4f7cf9c922a1 100644 --- a/ui/components/app/modals/confirm-delete-network/__snapshots__/confirm-delete-network.test.js.snap +++ b/ui/components/app/modals/confirm-delete-network/__snapshots__/confirm-delete-network.test.js.snap @@ -28,15 +28,11 @@ exports[`Confirm Delete Network should match snapshot 1`] = ` > diff --git a/ui/components/app/modals/confirm-remove-account/__snapshots__/confirm-remove-account.test.js.snap b/ui/components/app/modals/confirm-remove-account/__snapshots__/confirm-remove-account.test.js.snap index 0585d2b1d6b3..41b9359dd8c4 100644 --- a/ui/components/app/modals/confirm-remove-account/__snapshots__/confirm-remove-account.test.js.snap +++ b/ui/components/app/modals/confirm-remove-account/__snapshots__/confirm-remove-account.test.js.snap @@ -136,15 +136,11 @@ exports[`Confirm Remove Account should match snapshot 1`] = ` > diff --git a/ui/components/app/modals/confirm-reset-account/__snapshots__/confirm-reset-account.test.js.snap b/ui/components/app/modals/confirm-reset-account/__snapshots__/confirm-reset-account.test.js.snap index e1fd4e4cce98..3f44ce472913 100644 --- a/ui/components/app/modals/confirm-reset-account/__snapshots__/confirm-reset-account.test.js.snap +++ b/ui/components/app/modals/confirm-reset-account/__snapshots__/confirm-reset-account.test.js.snap @@ -28,15 +28,11 @@ exports[`Confirm Reset Account should match snapshot 1`] = ` > diff --git a/ui/components/app/modals/customize-nonce/__snapshots__/customize-nonce.test.js.snap b/ui/components/app/modals/customize-nonce/__snapshots__/customize-nonce.test.js.snap index 53c02de3c1fa..1bd81f144164 100644 --- a/ui/components/app/modals/customize-nonce/__snapshots__/customize-nonce.test.js.snap +++ b/ui/components/app/modals/customize-nonce/__snapshots__/customize-nonce.test.js.snap @@ -99,15 +99,11 @@ exports[`Customize Nonce should match snapshot 1`] = ` > diff --git a/ui/components/app/modals/hide-token-confirmation-modal/__snapshots__/hide-token-confirmation-modal.test.js.snap b/ui/components/app/modals/hide-token-confirmation-modal/__snapshots__/hide-token-confirmation-modal.test.js.snap index e12bbb688c53..16ef9005c5a5 100644 --- a/ui/components/app/modals/hide-token-confirmation-modal/__snapshots__/hide-token-confirmation-modal.test.js.snap +++ b/ui/components/app/modals/hide-token-confirmation-modal/__snapshots__/hide-token-confirmation-modal.test.js.snap @@ -73,16 +73,12 @@ exports[`Hide Token Confirmation Modal should match snapshot 1`] = ` diff --git a/ui/components/app/modals/reject-transactions/__snapshots__/reject-transactions.test.js.snap b/ui/components/app/modals/reject-transactions/__snapshots__/reject-transactions.test.js.snap index 5d993d8a3857..cf681bac0fd8 100644 --- a/ui/components/app/modals/reject-transactions/__snapshots__/reject-transactions.test.js.snap +++ b/ui/components/app/modals/reject-transactions/__snapshots__/reject-transactions.test.js.snap @@ -34,15 +34,11 @@ exports[`Reject Transactions Model should match snapshot 1`] = ` > diff --git a/ui/components/app/modals/transaction-confirmed/__snapshots__/transaction-confirmed.test.js.snap b/ui/components/app/modals/transaction-confirmed/__snapshots__/transaction-confirmed.test.js.snap index b4b6ed44093b..e10cdb476f5c 100644 --- a/ui/components/app/modals/transaction-confirmed/__snapshots__/transaction-confirmed.test.js.snap +++ b/ui/components/app/modals/transaction-confirmed/__snapshots__/transaction-confirmed.test.js.snap @@ -32,8 +32,6 @@ exports[`Transaction Confirmed should match snapshot 1`] = ` > diff --git a/ui/components/app/nft-details/__snapshots__/nft-details.test.js.snap b/ui/components/app/nft-details/__snapshots__/nft-details.test.js.snap index 0d9c362cc85d..365e65e33b7f 100644 --- a/ui/components/app/nft-details/__snapshots__/nft-details.test.js.snap +++ b/ui/components/app/nft-details/__snapshots__/nft-details.test.js.snap @@ -94,8 +94,6 @@ exports[`NFT Details should match minimal props and state snapshot 1`] = ` diff --git a/ui/components/app/signature-request-original/__snapshots__/signature-request-original.test.js.snap b/ui/components/app/signature-request-original/__snapshots__/signature-request-original.test.js.snap index e2bac4d237b8..ad527ef84ddf 100644 --- a/ui/components/app/signature-request-original/__snapshots__/signature-request-original.test.js.snap +++ b/ui/components/app/signature-request-original/__snapshots__/signature-request-original.test.js.snap @@ -248,16 +248,12 @@ exports[`SignatureRequestOriginal should match snapshot 1`] = ` diff --git a/ui/components/app/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap b/ui/components/app/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap index 00455bb3cc72..e3f0aa6ada26 100644 --- a/ui/components/app/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap +++ b/ui/components/app/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap @@ -392,16 +392,12 @@ https://example.com/my-web2-claim.json diff --git a/ui/components/app/signature-request/__snapshots__/signature-request.test.js.snap b/ui/components/app/signature-request/__snapshots__/signature-request.test.js.snap index 780adfe87f04..1e4303e31217 100644 --- a/ui/components/app/signature-request/__snapshots__/signature-request.test.js.snap +++ b/ui/components/app/signature-request/__snapshots__/signature-request.test.js.snap @@ -750,16 +750,12 @@ exports[`Signature Request Component render should match snapshot when we are us @@ -1525,16 +1521,12 @@ exports[`Signature Request Component render should match snapshot when we want t diff --git a/ui/components/app/transaction-breakdown/transaction-breakdown-row/__snapshots__/transaction-breakdown-row.component.test.js.snap b/ui/components/app/transaction-breakdown/transaction-breakdown-row/__snapshots__/transaction-breakdown-row.component.test.js.snap index 3796099b9be0..e4f30eebfb71 100644 --- a/ui/components/app/transaction-breakdown/transaction-breakdown-row/__snapshots__/transaction-breakdown-row.component.test.js.snap +++ b/ui/components/app/transaction-breakdown/transaction-breakdown-row/__snapshots__/transaction-breakdown-row.component.test.js.snap @@ -18,8 +18,6 @@ exports[`TransactionBreakdownRow Component should match snapshot 1`] = ` > diff --git a/ui/components/ui/button/button.component.js b/ui/components/ui/button/button.component.js index f60a2c4f13a9..3f73a3f07283 100644 --- a/ui/components/ui/button/button.component.js +++ b/ui/components/ui/button/button.component.js @@ -53,7 +53,7 @@ const Button = ({ } else if (submit) { buttonProps.type = 'submit'; } - if (typeof buttonProps.onClick === 'function') { + if (type === 'link' && typeof buttonProps.onClick === 'function') { buttonProps.onKeyUp ??= (event) => { if (event.key === 'Enter') { buttonProps.onClick(); diff --git a/ui/components/ui/page-container/page-container-footer/__snapshots__/page-container-footer.component.test.js.snap b/ui/components/ui/page-container/page-container-footer/__snapshots__/page-container-footer.component.test.js.snap index 3e685b7da5bf..4d76223ec42b 100644 --- a/ui/components/ui/page-container/page-container-footer/__snapshots__/page-container-footer.component.test.js.snap +++ b/ui/components/ui/page-container/page-container-footer/__snapshots__/page-container-footer.component.test.js.snap @@ -9,16 +9,12 @@ exports[`Page Footer should match snapshot 1`] = ` @@ -36,16 +32,12 @@ exports[`Page Footer should render a secondary footer inside page-container__foo diff --git a/ui/pages/confirm-add-suggested-nft/__snapshots__/confirm-add-suggested-nft.test.js.snap b/ui/pages/confirm-add-suggested-nft/__snapshots__/confirm-add-suggested-nft.test.js.snap index 02d00db76cf9..e807bd5915fc 100644 --- a/ui/pages/confirm-add-suggested-nft/__snapshots__/confirm-add-suggested-nft.test.js.snap +++ b/ui/pages/confirm-add-suggested-nft/__snapshots__/confirm-add-suggested-nft.test.js.snap @@ -203,16 +203,12 @@ exports[`ConfirmAddSuggestedNFT Component should match snapshot 1`] = ` @@ -417,16 +413,12 @@ exports[`ConfirmAddSuggestedNFT Component should match snapshot 1`] = ` diff --git a/ui/pages/confirm-decrypt-message/__snapshots__/confirm-decrypt-message.component.test.js.snap b/ui/pages/confirm-decrypt-message/__snapshots__/confirm-decrypt-message.component.test.js.snap index 660774024697..cb4715881e27 100644 --- a/ui/pages/confirm-decrypt-message/__snapshots__/confirm-decrypt-message.component.test.js.snap +++ b/ui/pages/confirm-decrypt-message/__snapshots__/confirm-decrypt-message.component.test.js.snap @@ -247,16 +247,12 @@ exports[`ConfirmDecryptMessage Component should match snapshot when preference i @@ -513,16 +509,12 @@ exports[`ConfirmDecryptMessage Component should match snapshot when preference i diff --git a/ui/pages/confirm-encryption-public-key/__snapshots__/confirm-encryption-public-key.component.test.js.snap b/ui/pages/confirm-encryption-public-key/__snapshots__/confirm-encryption-public-key.component.test.js.snap index 991d113693c6..05cee4e7016f 100644 --- a/ui/pages/confirm-encryption-public-key/__snapshots__/confirm-encryption-public-key.component.test.js.snap +++ b/ui/pages/confirm-encryption-public-key/__snapshots__/confirm-encryption-public-key.component.test.js.snap @@ -231,16 +231,12 @@ exports[`ConfirmDecryptMessage Component should match snapshot when preference i @@ -481,16 +477,12 @@ exports[`ConfirmDecryptMessage Component should match snapshot when preference i diff --git a/ui/pages/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap b/ui/pages/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap index bf7f3f28c1f8..3b54ae40e943 100644 --- a/ui/pages/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap +++ b/ui/pages/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap @@ -650,16 +650,12 @@ exports[`ConfirmSendEther should render correct information for for confirm send diff --git a/ui/pages/confirm-signature-request/__snapshots__/index.test.js.snap b/ui/pages/confirm-signature-request/__snapshots__/index.test.js.snap index af1c57973377..242aa836ea67 100644 --- a/ui/pages/confirm-signature-request/__snapshots__/index.test.js.snap +++ b/ui/pages/confirm-signature-request/__snapshots__/index.test.js.snap @@ -749,16 +749,12 @@ exports[`Confirm Signature Request Component render should match snapshot 1`] = diff --git a/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap b/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap index c7f611e1d895..c38ecfbb0da6 100644 --- a/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap +++ b/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap @@ -513,8 +513,6 @@ exports[`Confirm Transaction Base should match snapshot 1`] = ` @@ -522,8 +520,6 @@ exports[`Confirm Transaction Base should match snapshot 1`] = ` class="button btn--rounded btn-primary page-container__footer-button" data-testid="page-container-footer-next" disabled="" - role="button" - tabindex="0" > Confirm diff --git a/ui/pages/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap b/ui/pages/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap index fbe528e8c7db..a07d4d8bc62a 100644 --- a/ui/pages/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap +++ b/ui/pages/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap @@ -188,16 +188,12 @@ exports[`add-ethereum-chain confirmation should match snapshot 1`] = ` diff --git a/ui/pages/confirmation/templates/__snapshots__/create-snap-account.test.js.snap b/ui/pages/confirmation/templates/__snapshots__/create-snap-account.test.js.snap index e748bf2f8fc0..1c128567163e 100644 --- a/ui/pages/confirmation/templates/__snapshots__/create-snap-account.test.js.snap +++ b/ui/pages/confirmation/templates/__snapshots__/create-snap-account.test.js.snap @@ -181,16 +181,12 @@ exports[`create-snap-account confirmation should match snapshot 2`] = ` diff --git a/ui/pages/confirmation/templates/__snapshots__/error.test.js.snap b/ui/pages/confirmation/templates/__snapshots__/error.test.js.snap index b8bd4c706b2a..f317056e1a3e 100644 --- a/ui/pages/confirmation/templates/__snapshots__/error.test.js.snap +++ b/ui/pages/confirmation/templates/__snapshots__/error.test.js.snap @@ -58,8 +58,6 @@ exports[`error template matches the snapshot 1`] = ` diff --git a/ui/pages/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap b/ui/pages/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap index 8f22817b56b3..6081dc41ab4e 100644 --- a/ui/pages/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap +++ b/ui/pages/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap @@ -227,16 +227,12 @@ exports[`remove-snap-account confirmation should match snapshot 1`] = ` diff --git a/ui/pages/confirmation/templates/__snapshots__/success.test.js.snap b/ui/pages/confirmation/templates/__snapshots__/success.test.js.snap index 27f987c8c442..8f4607a405a9 100644 --- a/ui/pages/confirmation/templates/__snapshots__/success.test.js.snap +++ b/ui/pages/confirmation/templates/__snapshots__/success.test.js.snap @@ -49,8 +49,6 @@ exports[`success template matches the snapshot 1`] = ` diff --git a/ui/pages/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap b/ui/pages/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap index b2cb3e371b0d..5f98f8398022 100644 --- a/ui/pages/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap +++ b/ui/pages/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap @@ -104,16 +104,12 @@ exports[`switch-ethereum-chain confirmation should match snapshot 1`] = ` @@ -260,16 +256,12 @@ exports[`switch-ethereum-chain confirmation should show alert if there are pendi diff --git a/ui/pages/desktop-error/__snapshots__/desktop-error.test.js.snap b/ui/pages/desktop-error/__snapshots__/desktop-error.test.js.snap index 1da259ec2d52..d388c289306b 100644 --- a/ui/pages/desktop-error/__snapshots__/desktop-error.test.js.snap +++ b/ui/pages/desktop-error/__snapshots__/desktop-error.test.js.snap @@ -32,8 +32,6 @@ exports[`Desktop Error page should render connection lost page 1`] = ` @@ -44,8 +42,6 @@ exports[`Desktop Error page should render connection lost page 1`] = ` @@ -86,8 +82,6 @@ exports[`Desktop Error page should render critical error page 1`] = ` @@ -98,8 +92,6 @@ exports[`Desktop Error page should render critical error page 1`] = ` @@ -140,8 +132,6 @@ exports[`Desktop Error page should render default error page 1`] = ` @@ -182,8 +172,6 @@ exports[`Desktop Error page should render desktop app outdated page 1`] = ` @@ -224,8 +212,6 @@ exports[`Desktop Error page should render extension outdated page 1`] = ` @@ -271,8 +257,6 @@ exports[`Desktop Error page should render not found page 1`] = ` @@ -320,8 +304,6 @@ exports[`Desktop Error page should render pairing key not match page 1`] = ` @@ -362,8 +344,6 @@ exports[`Desktop Error page should render route not found page 1`] = ` diff --git a/ui/pages/onboarding-flow/add-network-modal/__snapshots__/add-network-modal.test.js.snap b/ui/pages/onboarding-flow/add-network-modal/__snapshots__/add-network-modal.test.js.snap index edcb21dad33d..3ea4eeb3917c 100644 --- a/ui/pages/onboarding-flow/add-network-modal/__snapshots__/add-network-modal.test.js.snap +++ b/ui/pages/onboarding-flow/add-network-modal/__snapshots__/add-network-modal.test.js.snap @@ -221,16 +221,12 @@ exports[`Add Network Modal should render 1`] = ` > diff --git a/ui/pages/onboarding-flow/create-password/__snapshots__/create-password.test.js.snap b/ui/pages/onboarding-flow/create-password/__snapshots__/create-password.test.js.snap index c7aa339afc5e..dd32042e485a 100644 --- a/ui/pages/onboarding-flow/create-password/__snapshots__/create-password.test.js.snap +++ b/ui/pages/onboarding-flow/create-password/__snapshots__/create-password.test.js.snap @@ -177,8 +177,6 @@ exports[`Onboarding Create Password Render should match snapshot 1`] = ` @@ -186,8 +184,6 @@ exports[`Onboarding Create Password Render should match snapshot 1`] = ` class="button btn--rounded btn-primary btn--large create-password__form--submit-button" data-testid="create-password-wallet" disabled="" - role="button" - tabindex="0" > Create a new wallet diff --git a/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap b/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap index ed23cc0d8b26..95f270194f6c 100644 --- a/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap +++ b/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap @@ -137,16 +137,12 @@ exports[`Onboarding Metametrics Component should match snapshot 1`] = ` diff --git a/ui/pages/onboarding-flow/recovery-phrase/__snapshots__/review-recovery-phrase.test.js.snap b/ui/pages/onboarding-flow/recovery-phrase/__snapshots__/review-recovery-phrase.test.js.snap index 8331a05d8d5f..e95f2e73c43b 100644 --- a/ui/pages/onboarding-flow/recovery-phrase/__snapshots__/review-recovery-phrase.test.js.snap +++ b/ui/pages/onboarding-flow/recovery-phrase/__snapshots__/review-recovery-phrase.test.js.snap @@ -288,8 +288,6 @@ exports[`Review Recovery Phrase Component should match snapshot 1`] = ` @@ -610,8 +608,6 @@ exports[`Review Recovery Phrase Component should match snapshot after reveal rec diff --git a/ui/pages/send/send-footer/__snapshots__/send-footer.test.js.snap b/ui/pages/send/send-footer/__snapshots__/send-footer.test.js.snap index 0b040a417b1c..5cfa9cc6b0b4 100644 --- a/ui/pages/send/send-footer/__snapshots__/send-footer.test.js.snap +++ b/ui/pages/send/send-footer/__snapshots__/send-footer.test.js.snap @@ -9,16 +9,12 @@ exports[`SendFooter Component Component Update should match snapshot when compon @@ -36,16 +32,12 @@ exports[`SendFooter Component should match snapshot 1`] = ` diff --git a/ui/pages/settings/advanced-tab/__snapshots__/advanced-tab.component.test.js.snap b/ui/pages/settings/advanced-tab/__snapshots__/advanced-tab.component.test.js.snap index 60d80a313148..e040a540f626 100644 --- a/ui/pages/settings/advanced-tab/__snapshots__/advanced-tab.component.test.js.snap +++ b/ui/pages/settings/advanced-tab/__snapshots__/advanced-tab.component.test.js.snap @@ -29,8 +29,6 @@ exports[`AdvancedTab Component should match snapshot 1`] = ` > @@ -61,8 +59,6 @@ exports[`AdvancedTab Component should match snapshot 1`] = ` > @@ -378,8 +374,6 @@ exports[`AdvancedTab Component should match snapshot 1`] = ` @@ -411,8 +405,6 @@ exports[`AdvancedTab Component should match snapshot 1`] = ` diff --git a/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap b/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap index e8ea928d052b..01973aba260a 100644 --- a/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap +++ b/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap @@ -277,8 +277,6 @@ exports[`ExperimentalTab with desktop enabled renders ExperimentalTab component > diff --git a/ui/pages/swaps/swaps-footer/__snapshots__/swaps-footer.test.js.snap b/ui/pages/swaps/swaps-footer/__snapshots__/swaps-footer.test.js.snap index 8a3e109db2a5..6527096c9e1b 100644 --- a/ui/pages/swaps/swaps-footer/__snapshots__/swaps-footer.test.js.snap +++ b/ui/pages/swaps/swaps-footer/__snapshots__/swaps-footer.test.js.snap @@ -15,16 +15,12 @@ exports[`SwapsFooter renders the component with initial props 1`] = ` diff --git a/ui/pages/token-allowance/__snapshots__/token-allowance.test.js.snap b/ui/pages/token-allowance/__snapshots__/token-allowance.test.js.snap index 2478f5096e4e..28d4aa93e2dd 100644 --- a/ui/pages/token-allowance/__snapshots__/token-allowance.test.js.snap +++ b/ui/pages/token-allowance/__snapshots__/token-allowance.test.js.snap @@ -454,16 +454,12 @@ exports[`TokenAllowancePage when mounted should match snapshot 1`] = ` diff --git a/ui/pages/unlock-page/__snapshots__/unlock-page.test.js.snap b/ui/pages/unlock-page/__snapshots__/unlock-page.test.js.snap index 324c6d990e4d..beb7e82699be 100644 --- a/ui/pages/unlock-page/__snapshots__/unlock-page.test.js.snap +++ b/ui/pages/unlock-page/__snapshots__/unlock-page.test.js.snap @@ -60,9 +60,7 @@ exports[`Unlock Page should match snapshot 1`] = ` class="button btn--rounded btn-default" data-testid="unlock-submit" disabled="" - role="button" style="margin-top: 20px; height: 60px; font-weight: 400; box-shadow: none; border-radius: 100px;" - tabindex="0" variant="contained" > Unlock From fd9989d330bb7ca6f90f4fcbfc87576d8ceb8afb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albert=20Oliv=C3=A9?= Date: Fri, 6 Oct 2023 15:39:59 +0200 Subject: [PATCH 053/219] =?UTF-8?q?[MMI]=C2=A0Removing=20unused=20assets?= =?UTF-8?q?=20and=20changed=20mmi=20logo=20with=20orange=20beard=20(#21186?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Explanation Removing unused assets and changed mmi logo with orange beard ## Pre-merge author checklist - [x] I've clearly explained: - [x] What problem this PR is solving - [x] How this problem was solved - [x] How reviewers can test my changes - [x] Sufficient automated test coverage has been added ## Pre-merge reviewer checklist - [x] Manual testing (e.g. pull and build branch, run in browser, test code being changed) - [x] **IF** this PR fixes a bug in the release milestone, add this PR to the release milestone If further QA is required (e.g. new feature, complex testing steps, large refactor), add the `Extension QA Board` label. In this case, a QA Engineer approval will be be required. --- app/_locales/de/messages.json | 3 - app/_locales/el/messages.json | 3 - app/_locales/en/messages.json | 3 - app/_locales/es/messages.json | 3 - app/_locales/fr/messages.json | 3 - app/_locales/hi/messages.json | 3 - app/_locales/id/messages.json | 3 - app/_locales/ja/messages.json | 3 - app/_locales/ko/messages.json | 3 - app/_locales/pt/messages.json | 3 - app/_locales/ru/messages.json | 3 - app/_locales/tl/messages.json | 3 - app/_locales/tr/messages.json | 3 - app/_locales/vi/messages.json | 3 - app/_locales/zh_CN/messages.json | 3 - .../mmi/images/check-green-solid.svg | 6 - .../mmi/images/close-red-solid.svg | 8 - .../mmi/images/custodialWallet.svg | 3 - app/build-types/mmi/images/icon-128.png | Bin 10225 -> 6275 bytes app/build-types/mmi/images/icon-16.png | Bin 2366 -> 783 bytes app/build-types/mmi/images/icon-19.png | Bin 2559 -> 919 bytes app/build-types/mmi/images/icon-32.png | Bin 3402 -> 1588 bytes app/build-types/mmi/images/icon-38.png | Bin 3815 -> 1861 bytes app/build-types/mmi/images/icon-48.png | Bin 16021 -> 2405 bytes app/build-types/mmi/images/icon-512.png | Bin 38334 -> 24223 bytes app/build-types/mmi/images/icon-64.png | Bin 5665 -> 3116 bytes .../mmi/images/icons/portfolio-dashboard.svg | 6 - app/build-types/mmi/images/info-logo.png | Bin 17475 -> 11674 bytes app/build-types/mmi/images/jupiter.svg | 1 - app/build-types/mmi/images/mmi-mascot.json | 322 ------- app/build-types/mmi/images/mmi-swaps.svg | 379 -------- app/build-types/mmi/images/portfolio.svg | 9 - app/build-types/mmi/mmi-mascot.json | 824 ++++++++++++++++++ app/scripts/metamask-controller.js | 11 +- package.json | 2 +- shared/notifications/institutional/index.js | 35 - .../component-library/icon/icon.types.ts | 1 - ui/helpers/utils/build-types.js | 2 +- yarn.lock | 10 +- 39 files changed, 832 insertions(+), 832 deletions(-) delete mode 100644 app/build-types/mmi/images/check-green-solid.svg delete mode 100644 app/build-types/mmi/images/close-red-solid.svg delete mode 100644 app/build-types/mmi/images/custodialWallet.svg delete mode 100644 app/build-types/mmi/images/icons/portfolio-dashboard.svg delete mode 100644 app/build-types/mmi/images/jupiter.svg delete mode 100644 app/build-types/mmi/images/mmi-mascot.json delete mode 100644 app/build-types/mmi/images/mmi-swaps.svg delete mode 100644 app/build-types/mmi/images/portfolio.svg create mode 100644 app/build-types/mmi/mmi-mascot.json delete mode 100644 shared/notifications/institutional/index.js diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index 213d8876df39..24afbd375a2d 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -5273,9 +5273,6 @@ "viewOnOpensea": { "message": "Auf Opensea ansehen" }, - "viewPortfolioDashboard": { - "message": "Portfolio-Dashboard anzeigen" - }, "viewinCustodianApp": { "message": "In Verwahrungs-App anzeigen" }, diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index b5f4828434af..08678e0aa55f 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -5273,9 +5273,6 @@ "viewOnOpensea": { "message": "Προβολή στο Opensea" }, - "viewPortfolioDashboard": { - "message": "Προβολή πίνακα ελέγχου χαρτοφυλακίου" - }, "viewinCustodianApp": { "message": "Προβολή στην εφαρμογή θεματοφύλακα" }, diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index dfa10c9732aa..4d96c5508835 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -5525,9 +5525,6 @@ "viewOnOpensea": { "message": "View on Opensea" }, - "viewPortfolioDashboard": { - "message": "View Portfolio Dashboard" - }, "viewinCustodianApp": { "message": "View in custodian app" }, diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 7f9b105957b4..34093490fbfa 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -5273,9 +5273,6 @@ "viewOnOpensea": { "message": "Ver en Opensea" }, - "viewPortfolioDashboard": { - "message": "Ver panel de cartera" - }, "viewinCustodianApp": { "message": "Ver en la aplicación de custodia" }, diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index 33cca3bfc540..bd08715878a9 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -5273,9 +5273,6 @@ "viewOnOpensea": { "message": "Afficher sur Opensea" }, - "viewPortfolioDashboard": { - "message": "Afficher le tableau de bord du portefeuille" - }, "viewinCustodianApp": { "message": "Afficher dans l’application dépositaire" }, diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index 658e6bb42e33..f6e1e780c8d9 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -5273,9 +5273,6 @@ "viewOnOpensea": { "message": "Opensea पर देखें" }, - "viewPortfolioDashboard": { - "message": "Portfolio डैशबोर्ड देखें" - }, "viewinCustodianApp": { "message": "Custodian ऐप में देखें" }, diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index 4c4d238492bf..81a3ea3b51d9 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -5273,9 +5273,6 @@ "viewOnOpensea": { "message": "Lihat di Opensea" }, - "viewPortfolioDashboard": { - "message": "Tampilkan Dasbor Portofolio" - }, "viewinCustodianApp": { "message": "Lihat di aplikasi kustodian" }, diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index 267ab31b4fdb..6d24c1179a3b 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -5273,9 +5273,6 @@ "viewOnOpensea": { "message": "Openseaで表示" }, - "viewPortfolioDashboard": { - "message": "Portfolioダッシュボードを表示" - }, "viewinCustodianApp": { "message": "カストディアンアプリで表示" }, diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index 6e6e5f1af2ce..bfa48db76956 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -5273,9 +5273,6 @@ "viewOnOpensea": { "message": "Opensea에서 보기" }, - "viewPortfolioDashboard": { - "message": "포트폴리오 대시보드 보기" - }, "viewinCustodianApp": { "message": "수탁 앱에서 보기" }, diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index 908dcf4cf6c9..257855b52ab8 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -5273,9 +5273,6 @@ "viewOnOpensea": { "message": "Ver na OpenSea" }, - "viewPortfolioDashboard": { - "message": "Ver painel do portfólio" - }, "viewinCustodianApp": { "message": "Ver no app custodiante" }, diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index a43db33c1199..53880c65e88e 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -5273,9 +5273,6 @@ "viewOnOpensea": { "message": "Смотреть на OpenSea" }, - "viewPortfolioDashboard": { - "message": "Просмотр панели инструментов Portfolio" - }, "viewinCustodianApp": { "message": "Смотреть в приложении депозитария" }, diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json index 014e1a06c385..22d24a3b9fe2 100644 --- a/app/_locales/tl/messages.json +++ b/app/_locales/tl/messages.json @@ -5273,9 +5273,6 @@ "viewOnOpensea": { "message": "Tingnan sa Opensea" }, - "viewPortfolioDashboard": { - "message": "Tingnan ang Dashboard ng Portfolio" - }, "viewinCustodianApp": { "message": "Tingnan sa app custodian" }, diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index 1ceb3c54d670..7d4d98590169 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -5273,9 +5273,6 @@ "viewOnOpensea": { "message": "Opensea'de görüntüle" }, - "viewPortfolioDashboard": { - "message": "Portföy Kontrol Panelini görüntüle" - }, "viewinCustodianApp": { "message": "Saklayıcı kurum uygulamasında görüntüle" }, diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index d17b243151f6..7ed25c06b926 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -5273,9 +5273,6 @@ "viewOnOpensea": { "message": "Xem trên Opensea" }, - "viewPortfolioDashboard": { - "message": "Xem Trang tổng quan Danh mục đầu tư" - }, "viewinCustodianApp": { "message": "Xem trong ứng dụng lưu ký" }, diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index d07fc2f81d7b..b0a60bec3dad 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -5273,9 +5273,6 @@ "viewOnOpensea": { "message": "在 Opensea 上查看" }, - "viewPortfolioDashboard": { - "message": "查看 Portfolio 控制面板" - }, "viewinCustodianApp": { "message": "在托管应用程序中查看" }, diff --git a/app/build-types/mmi/images/check-green-solid.svg b/app/build-types/mmi/images/check-green-solid.svg deleted file mode 100644 index 68c46196d1e7..000000000000 --- a/app/build-types/mmi/images/check-green-solid.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/app/build-types/mmi/images/close-red-solid.svg b/app/build-types/mmi/images/close-red-solid.svg deleted file mode 100644 index 728c70457a60..000000000000 --- a/app/build-types/mmi/images/close-red-solid.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/app/build-types/mmi/images/custodialWallet.svg b/app/build-types/mmi/images/custodialWallet.svg deleted file mode 100644 index 00f9bd3b0ca5..000000000000 --- a/app/build-types/mmi/images/custodialWallet.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/app/build-types/mmi/images/icon-128.png b/app/build-types/mmi/images/icon-128.png index b63d1cd4f16ce43427fd1eb50cbec8650f846f14..b71f4fa6fadc3475f1180d41dcaa818121dfe4fa 100644 GIT binary patch literal 6275 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 literal 10225 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%0ApJTQu>+={mq1tqlW~P47h$;WS=dw-@<5> z=zT@LwBdJI8+E&*o`;q=D*&qwJ%VD`;0T^()wY>a&`$i!w9qHF&WoX1ykU*Re$wb+ zpXJUjiG{$fi(aAHTfu>4Gl{-x#{C1gDIKV2TUs`rJO+>}G$y*c1fO)qu(taO9j9Cue{!!EA%gSIrsZMUNsUUS9*8RNBWtT zU1VeR$BzY`csk=^(zeV6&0bd!hDs(aBY=S!(=Xa4pzdS4 zvckP)nh>!1Lc8=@<{D&1NLlUQh-C*87z%rWY~=qeuUHGNtx?8-R1&NeG{P1DKo!!^ z``A2jT>)FZrduE7LPMM;?353m#ocDGVV$ zOWIW+m4Bm7B9B&SDggqhDSkaencW$F!#ppP?!Q%zJojQ(wv^o)eU-2RXR@|Pcog1q zJbPcbkWZmlwtji1sJ)$|WU@tdb8E{|%vbOoxZ>qNc$PM3%(!&>+Ev5cO+jScS@R=j zH`~fgF{ualh(^Ta20IbD)6zx}+9ZH14ki>jEE0U?C}dfnA*xA@TAui_m4{ zw|zzQRNpoyUVmN0AfX(Tph|td(@b>%RhLWql^u47=9WcSoR_+Bgq@I(p!hb1F*7{8 z`&o;F5(r(}sAx$;T)AdJWm@8arvcg0TdHw(9Jb}dl*qc}tvzLw0}6Opt*b>(PlFy4 zJ#Tk)mUeNTUS4cja?Y%&=G9E>;9%u68>iCuS9+`TGVt-~u@$X#{);!6zHt%R=t~ed zjOp?sARSL(q4-h?ein8Zqo$wVtC456^c6!YxF_#J6?QCN>eH{UT<`nG*a|qc%Z@JR z`j6WuCEb1%QW?BE?~YHOo(euH!uTFagU|;^^1a@7)hN&Lqrg5gHrFUWZaOLOCuW;8 z$rA&a_vn=(J8s(~1{CZ1)QBWV%&b3!x$qcUyJv&=SlxOYqwg8o;?c(Jr;pKxF zt>;wH0;dncPS)*BGs$(ydM`2gpI(Spc+9V{2LngPKSJ74-@K|(rU4y5;M2$j1ItEYbq)VH>+eXmjIh!gtrbr&ow$X5{;sID-00!J6?sOOygCFbAUWZsDk{QcKjoLKh zBKDE(p>NEa=hX&j4OT_l#<);)TT*X`rhX?#)~#wxYx8na$+UZEr{wc?+NMBddvX@2 zLoZL8wV4AC*`#!!obsa_S9X1bmQ1_{#eL0!r? z`YsI8(%%kEOa*hoRqEy}=v2-DtUCi^*673&s#xHfcw(Y7ywRqq8;oo&=kmReD)G*i z0xjKH`wp2Ab2c)9e38dBWPYCoaMu#z-V93Fx5e|e^~*2+-VM~TjtpRde6OC3yyq07 zW>u-byz&LkgFK~Or!HH&k-c0t)Bu#%G%VRG!~R=NFS~Gzjo46ha1a>QIEX6~`i^Sc zqIae~1VXqI29=8kGFsSOFoFAZ;5cU1z`keTNw$_z3G@`tAMP0aSzCv_$jaaX%km=| z&Cw?0Psd~zu!gK?eB4wOOIML?Y<4(B^<+?o55ZexgWhW9Tb`WOMS zX{rKvRMsfRaT@pdJu@Sw%M`#g~2pU{VI!B(h0MwMU6l>(IBmNH&zESZ2 diff --git a/app/build-types/mmi/images/icon-16.png b/app/build-types/mmi/images/icon-16.png index 86f9caddad967b6ad91ecea68c2a51d67eeb9e94..f5e8dadf537c6a8357d07ef2743097f939b832df 100644 GIT binary patch delta 772 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 literal 2559 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 literal 16021 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 aec7%w{50mkhRVCUOm$^#r5Xk6@c#q;uY1J+ diff --git a/app/build-types/mmi/images/icon-512.png b/app/build-types/mmi/images/icon-512.png index 4046713753ac5e84bd5eb0014d54efda828ee201..0b00612f5225ca1d30e83ad41d9450e7b7c18d32 100644 GIT binary patch literal 24223 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 literal 38334 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 diff --git a/app/build-types/mmi/images/icon-64.png b/app/build-types/mmi/images/icon-64.png index 278183b9e47eae882dc6443b7ea434bfc4de8347..cfbd477017edac58c23712876c20829b29247ef0 100644 GIT binary patch literal 3116 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 - - \ No newline at end of file diff --git a/app/build-types/mmi/images/info-logo.png b/app/build-types/mmi/images/info-logo.png index 3b19236ab9349a064c2df5d06340bfa027fba74b..c55b394a72d6ebf5fb984e7751f43fe44dd7d142 100644 GIT binary patch literal 11674 zcmX9^XE>bS(`N0mMOiEsQC9TcA|i;@dk{nkRtcgHbd)^LYsJp#D z+*FM{2nbx-{yPX~R_f?(UlMxgsmK#lkKXxy`v9~JnjBmLLKG0U*Q(h+bc$BCVPl0ZR(EEKuDrH@=g@?Hh%8yMq#kfBI~~P)iZ7+F8uP zmd1(F)LX44JxUv6_h}dBWKV}DO$`ZU>K!o^8}Jj8is{rf4YmQ22q7>5+A8YY`pwUk zNinih@wNb$53c7+7BoOG5-ujQd?S0~F)EW8s?qf5rOSD_X=X?5!Ag3hXcbvx`*{jL zm7NMT=M%cEPAwLYz|0t2A}n!!GHl^_+VUp|AUJ=$^@k{}H@~S#d9KR~B!2(?oiE&5 zI_LFdGOWp}R+g({+imJ{uk*8W7lZzOQLWa=B2-Tce;YhsH#_oS(*)im^D-D0^l5!| zWW;#a-h$ZCuzBNVn?|0TTF<}nay~;^l|4mg{`{}g+wvq8d$r}k>aC@tBk{nO+r)_2 z^6MmdZ^Q4qGD|&71MO761{h*!ar##7aJBjX=W}?;SbSebD)aXmJPMPx(pWVCSNCI$g>?s+d{a5Ao>f@ z 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 literal 17475 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 diff --git a/app/build-types/mmi/images/jupiter.svg b/app/build-types/mmi/images/jupiter.svg deleted file mode 100644 index 6beef9c2f2e9..000000000000 --- a/app/build-types/mmi/images/jupiter.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/build-types/mmi/images/mmi-mascot.json b/app/build-types/mmi/images/mmi-mascot.json deleted file mode 100644 index 013cec092c3b..000000000000 --- a/app/build-types/mmi/images/mmi-mascot.json +++ /dev/null @@ -1,322 +0,0 @@ -{ - "chunks": [ - { - "color": [182, 202, 252], - "faces": [ - [17, 33, 10], - [17, 18, 34], - [34, 33, 17], - [10, 6, 17], - [11, 15, 31], - [31, 18, 11], - [18, 12, 11], - [14, 16, 40], - [40, 41, 14], - [59, 5, 35], - [35, 79, 59], - [67, 63, 77], - [67, 77, 76], - [76, 68, 67], - [63, 67, 58], - [64, 68, 75], - [75, 37, 64], - [68, 64, 66], - [14, 41, 37], - [37, 15, 14], - [5, 59, 40], - [40, 16, 5] - ] - }, - { - "color": [109, 149, 249], - "faces": [ - [31, 24, 18], - [6, 5, 16], - [16, 17, 6], - [24, 32, 33], - [33, 34, 24], - [5, 4, 35], - [75, 68, 71], - [58, 67, 40], - [40, 59, 58], - [71, 76, 77], - [77, 78, 71] - ] - }, - { - "color": [44, 86, 221], - "faces": [ - [0, 1, 2], - [2, 3, 0], - [4, 5, 2], - [6, 3, 2], - [2, 5, 6], - [7, 8, 9], - [10, 3, 6], - [10, 50, 7], - [7, 3, 10], - [7, 9, 3], - [49, 0, 9], - [3, 9, 0], - [53, 54, 55], - [55, 56, 53], - [57, 56, 55], - [58, 59, 55], - [55, 54, 58], - [60, 61, 62], - [63, 58, 54], - [63, 60, 89], - [60, 63, 54], - [60, 54, 61], - [88, 61, 53], - [54, 53, 61], - [2, 1, 4], - [55, 59, 57] - ] - }, - { - "color": [47, 52, 59], - "faces": [ - [36, 15, 37], - [37, 38, 36], - [31, 39, 22], - [22, 21, 31], - [31, 15, 36], - [36, 39, 31], - [75, 69, 26], - [26, 80, 75], - [75, 80, 38], - [38, 37, 75], - [38, 80, 39], - [39, 36, 38], - [39, 80, 26], - [26, 22, 39] - ] - }, - { - "color": [245, 247, 249], - "faces": [ - [21, 20, 24], - [24, 31, 21], - [69, 71, 70], - [71, 69, 75] - ] - }, - { - "color": [219, 229, 254], - "faces": [ - [19, 20, 21], - [21, 22, 19], - [20, 19, 23], - [23, 24, 20], - [23, 25, 24], - [19, 22, 26], - [26, 27, 19], - [23, 28, 29], - [23, 29, 30], - [25, 23, 30], - [29, 51, 52], - [52, 30, 29], - [27, 26, 69], - [69, 70, 27], - [70, 71, 72], - [72, 27, 70], - [72, 71, 73], - [51, 74, 72], - [52, 51, 72], - [73, 52, 72], - [19, 27, 74], - [74, 28, 19], - [51, 29, 28], - [28, 74, 51], - [74, 27, 72], - [28, 23, 19] - ] - }, - { - "color": [73, 123, 248], - "faces": [ - [24, 34, 18], - [16, 13, 12], - [12, 17, 16], - [13, 16, 11], - [71, 68, 76], - [40, 67, 66], - [66, 65, 40], - [65, 64, 40] - ] - }, - { - "color": [47, 52, 59], - "faces": [ - [11, 12, 13], - [64, 65, 66] - ] - }, - { - "color": [109, 149, 249], - "faces": [ - [14, 15, 11], - [11, 16, 14], - [17, 12, 18], - [41, 64, 37], - [67, 68, 66] - ] - }, - { - "color": [109, 149, 249], - "faces": [ - [35, 4, 42], - [4, 1, 42], - [42, 43, 44], - [44, 35, 42], - [45, 43, 42], - [42, 10, 45], - [30, 32, 24], - [24, 25, 30], - [30, 33, 32], - [33, 30, 10], - [44, 43, 46], - [43, 45, 47], - [47, 46, 43], - [48, 47, 45], - [45, 30, 48], - [30, 45, 10], - [49, 42, 0], - [8, 7, 42], - [50, 42, 7], - [50, 10, 42], - [1, 0, 42], - [42, 9, 8], - [42, 49, 9], - [64, 41, 40], - [57, 59, 79], - [79, 81, 57], - [57, 81, 56], - [82, 79, 35], - [35, 44, 82], - [81, 79, 82], - [82, 83, 81], - [84, 63, 81], - [81, 83, 84], - [44, 46, 85], - [85, 82, 44], - [52, 73, 71], - [71, 78, 52], - [52, 78, 77], - [77, 63, 52], - [82, 85, 83], - [83, 85, 86], - [86, 84, 83], - [87, 52, 84], - [84, 86, 87], - [52, 63, 84], - [88, 53, 81], - [62, 81, 60], - [89, 60, 81], - [89, 81, 63], - [56, 81, 53], - [81, 62, 61], - [81, 61, 88], - [48, 87, 86], - [86, 47, 48], - [47, 86, 85], - [85, 46, 47], - [48, 30, 52], - [52, 87, 48] - ] - } - ], - "positions": [ - [111.0246, 52.6046, 46.2259], - [114.025, 87.6733, 58.9818], - [66.192, 80.898, 55.3943], - [72.1133, 35.4918, 30.8714], - [97.8045, 116.561, 73.9788], - [16.7623, 58.0109, 58.0782], - [52.6089, 30.3641, 42.5561], - [106.8814, 31.9455, 46.9133], - [113.4846, 38.6049, 49.1215], - [108.6633, 43.2332, 46.3154], - [101.2166, 15.9822, 46.3082], - [16.6605, -16.2883, 93.6187], - [40.775, -10.2288, 85.2764], - [23.9269, -2.5103, 86.7365], - [11.1691, -7.0037, 99.3776], - [9.5692, -34.3939, 141.672], - [12.596, 7.1655, 88.741], - [61.1809, 8.8142, 76.9968], - [39.7195, -28.9271, 88.9638], - [13.7962, -68.5757, 132.057], - [15.2674, -62.32, 129.688], - [14.8446, -52.6096, 140.113], - [12.8917, -49.7716, 144.741], - [35.6042, -71.758, 81.0639], - [47.4625, -68.6061, 63.3697], - [38.2486, -64.7302, 38.9099], - [-12.8917, -49.7716, 144.741], - [-13.7962, -68.5757, 132.057], - [17.8021, -71.758, 81.0639], - [19.1243, -69.0168, 49.4201], - [38.2486, -66.2756, 17.7762], - [12.8928, -36.7035, 141.672], - [109.284, -93.5899, 27.8243], - [122.118, -36.8894, 35.025], - [67.7668, -30.197, 78.4178], - [33.1807, 101.852, 25.3186], - [9.4063, -35.5898, 150.722], - [-9.5692, -34.3939, 141.672], - [-9.4063, -35.5898, 150.722], - [11.4565, -37.8994, 150.722], - [-12.596, 7.1655, 88.741], - [-11.1691, -7.0037, 99.3776], - [70.2365, 62.8362, -3.9475], - [47.2634, 54.294, -27.4148], - [28.7302, 91.7311, -24.9726], - [69.1676, 6.5862, -12.7757], - [28.7302, 49.1003, -48.3596], - [31.903, 5.692, -47.822], - [35.0758, -34.4329, -16.2809], - [115.2841, 48.6815, 48.6841], - [110.8428, 28.4821, 49.1762], - [-19.1243, -69.0168, 49.4201], - [-38.2486, -66.2756, 17.7762], - [-111.0246, 52.6046, 46.2259], - [-72.1133, 35.4918, 30.8714], - [-66.192, 80.898, 55.3943], - [-114.025, 87.6733, 58.9818], - [-97.8045, 116.561, 73.9788], - [-52.6089, 30.3641, 42.5561], - [-16.7623, 58.0109, 58.0782], - [-106.8814, 31.9455, 46.9133], - [-108.6633, 43.2332, 46.3154], - [-113.4846, 38.6049, 49.1215], - [-101.2166, 15.9822, 46.3082], - [-16.6605, -16.2883, 93.6187], - [-23.9269, -2.5103, 86.7365], - [-40.775, -10.2288, 85.2764], - [-61.1809, 8.8142, 76.9968], - [-39.7195, -28.9271, 88.9638], - [-14.8446, -52.6096, 140.113], - [-15.2674, -62.32, 129.688], - [-47.4625, -68.6061, 63.3697], - [-35.6042, -71.758, 81.0639], - [-38.2486, -64.7302, 38.9099], - [-17.8021, -71.758, 81.0639], - [-12.8928, -36.7035, 141.672], - [-67.7668, -30.197, 78.4178], - [-122.118, -36.8894, 35.025], - [-109.284, -93.5899, 27.8243], - [-33.1807, 101.852, 25.3186], - [-11.4565, -37.8994, 150.722], - [-70.2365, 62.8362, -3.9475], - [-28.7302, 91.7311, -24.9726], - [-47.2634, 54.294, -27.4148], - [-69.1676, 6.5862, -12.7757], - [-28.7302, 49.1003, -48.3596], - [-31.903, 5.692, -47.822], - [-35.0758, -34.4329, -16.2809], - [-115.2841, 48.6815, 48.6841], - [-110.8428, 28.4821, 49.1762] - ] -} diff --git a/app/build-types/mmi/images/mmi-swaps.svg b/app/build-types/mmi/images/mmi-swaps.svg deleted file mode 100644 index 6199bcb94956..000000000000 --- a/app/build-types/mmi/images/mmi-swaps.svg +++ /dev/null @@ -1,379 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/build-types/mmi/images/portfolio.svg b/app/build-types/mmi/images/portfolio.svg deleted file mode 100644 index 296366a8c7c8..000000000000 --- a/app/build-types/mmi/images/portfolio.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/app/build-types/mmi/mmi-mascot.json b/app/build-types/mmi/mmi-mascot.json new file mode 100644 index 000000000000..f28a25f5e28e --- /dev/null +++ b/app/build-types/mmi/mmi-mascot.json @@ -0,0 +1,824 @@ +{ + "chunks": [ + { + "faces": [ + [0, 1, 2], + [2, 3, 0], + [4, 5, 2], + [6, 3, 2], + [2, 5, 6], + [7, 8, 9], + [10, 3, 6], + [10, 50, 7], + [7, 3, 10], + [7, 9, 3], + [49, 0, 9], + [3, 9, 0], + [2, 1, 4] + ], + "name": "left ear", + "gradient": "left-ear-gradient" + }, + { + "faces": [ + [53, 54, 55], + [55, 56, 53], + [57, 56, 55], + [58, 59, 55], + [55, 54, 58], + [60, 61, 62], + [63, 58, 54], + [63, 60, 89], + [60, 63, 54], + [60, 54, 61], + [88, 61, 53], + [54, 53, 61], + [55, 59, 57] + ], + "name": "right ear", + "gradient": "right-ear-gradient" + }, + { + "color": [22, 22, 22], + "faces": [[11, 12, 13]], + "name": "left eye" + }, + { + "color": [22, 22, 22], + "faces": [[64, 65, 66]], + "name": "right eye" + }, + { + "faces": [ + [14, 15, 11], + [11, 16, 14] + ], + "name": "left inner eye", + "gradient": "left-inner-eye-gradient" + }, + { + "faces": [[17, 12, 18]], + "name": "left outer eye", + "gradient": "left-outer-eye-gradient" + }, + { + "faces": [[41, 64, 37]], + "name": "right lower inner eye", + "gradient": "right-inner-eye-gradient" + }, + { + "faces": [[67, 68, 66]], + "name": "right outer eye", + "gradient": "right-outer-eye-gradient" + }, + { + "color": [215, 193, 179], + "faces": [ + [19, 20, 21], + [21, 22, 19], + [20, 19, 23], + [23, 24, 20], + [23, 25, 24], + [19, 22, 26], + [26, 27, 19], + [23, 28, 29], + [23, 29, 30], + [25, 23, 30], + [29, 51, 52], + [52, 30, 29], + [27, 26, 69], + [69, 70, 27], + [70, 71, 72], + [72, 27, 70], + [72, 71, 73], + [51, 74, 72], + [52, 51, 72], + [73, 52, 72], + [19, 27, 74], + [74, 28, 19], + [51, 29, 28], + [28, 74, 51], + [74, 27, 72], + [28, 23, 19] + ], + "name": "lower chin" + }, + { + "color": [215, 193, 179], + "faces": [ + [21, 20, 24], + [24, 31, 21] + ], + "name": "left lower snout" + }, + { + "color": [215, 193, 179], + "faces": [ + [69, 71, 70], + [71, 69, 75] + ], + "name": "right lower snout" + }, + { + "color": [109, 149, 249], + "faces": [[31, 24, 18]], + "name": "left upper snout" + }, + { + "faces": [ + [6, 5, 16], + [16, 17, 6] + ], + "name": "left forehead", + "gradient": "left-forehead-gradient" + }, + { + "faces": [ + [24, 32, 33], + [33, 34, 24] + ], + "name": "left lower cheek", + "gradient": "left-lower-cheek-gradient" + }, + { + "faces": [[5, 4, 35]], + "name": "left top ear", + "gradient": "left-top-ear-gradient" + }, + { + "color": [109, 149, 249], + "faces": [[75, 68, 71]], + "name": "right upper snout" + }, + { + "faces": [ + [58, 67, 40], + [40, 59, 58] + ], + "name": "right forhead", + "gradient": "right-forehead-gradient" + }, + { + "faces": [ + [71, 76, 77], + [77, 78, 71] + ], + "name": "right lower cheek", + "gradient": "right-lower-cheek-gradient" + }, + { + "faces": [[24, 34, 18]], + "name": "left middle cheek", + "gradient": "left-middle-cheek-gradient" + }, + { + "color": [73, 123, 248], + "faces": [ + [16, 13, 12], + [12, 17, 16], + [13, 16, 11] + ], + "name": "left above eye" + }, + { + "faces": [[71, 68, 76]], + "name": "right middle cheek", + "gradient": "right-middle-cheek-gradient" + }, + { + "color": [73, 123, 248], + "faces": [ + [40, 67, 66], + [66, 65, 40], + [65, 64, 40] + ], + "name": "right above eye" + }, + { + "color": [22, 22, 22], + "faces": [ + [36, 15, 37], + [37, 38, 36], + [31, 39, 22], + [22, 21, 31], + [31, 15, 36], + [36, 39, 31], + [75, 69, 26], + [26, 80, 75], + [75, 80, 38], + [38, 37, 75], + [38, 80, 39], + [39, 36, 38], + [39, 80, 26], + [26, 22, 39] + ], + "name": "nose" + }, + { + "faces": [ + [17, 33, 10], + [17, 18, 34], + [34, 33, 17], + [10, 6, 17] + ], + "name": "left upper cheek", + "gradient": "left-upper-cheek-gradient" + }, + { + "faces": [ + [11, 15, 31], + [31, 18, 11], + [18, 12, 11] + ], + "name": "left below eye", + "gradient": "left-below-eye-gradient" + }, + { + "faces": [ + [14, 16, 40], + [40, 41, 14], + [59, 5, 35], + [35, 79, 59], + [14, 41, 37], + [37, 15, 14], + [5, 59, 40], + [40, 16, 5] + ], + "name": "forehead", + "gradient": "forehead-gradient" + }, + { + "faces": [ + [67, 63, 77], + [67, 77, 76], + [76, 68, 67], + [63, 67, 58] + ], + "name": "right upper cheek", + "gradient": "right-upper-cheek-gradient" + }, + { + "faces": [ + [64, 68, 75], + [75, 37, 64], + [68, 64, 66] + ], + "name": "right below eye", + "gradient": "right-below-eye-gradient" + }, + { + "faces": [ + [35, 4, 42], + [4, 1, 42], + [42, 43, 44], + [44, 35, 42], + [45, 43, 42], + [42, 10, 45], + [30, 32, 24], + [24, 25, 30], + [30, 33, 32], + [33, 30, 10], + [44, 43, 46], + [43, 45, 47], + [47, 46, 43], + [48, 47, 45], + [45, 30, 48], + [30, 45, 10], + [49, 42, 0], + [8, 7, 42], + [50, 42, 7], + [50, 10, 42], + [1, 0, 42], + [42, 9, 8], + [42, 49, 9], + [79, 81, 57], + [57, 81, 56], + [82, 79, 35], + [35, 44, 82], + [81, 79, 82], + [82, 83, 81], + [84, 63, 81], + [81, 83, 84], + [44, 46, 85], + [85, 82, 44], + [52, 73, 71], + [71, 78, 52], + [52, 78, 77], + [77, 63, 52], + [82, 85, 83], + [83, 85, 86], + [86, 84, 83], + [87, 52, 84], + [84, 86, 87], + [52, 63, 84], + [88, 53, 81], + [62, 81, 60], + [89, 60, 81], + [89, 81, 63], + [56, 81, 53], + [81, 62, 61], + [81, 61, 88], + [48, 87, 86], + [86, 47, 48], + [47, 86, 85], + [85, 46, 47], + [48, 30, 52], + [52, 87, 48] + ], + "name": "back", + "gradient": "back-gradient" + }, + { + "faces": [[57, 59, 79]], + "name": "right top ear", + "gradient": "right-top-ear-gradient" + }, + { + "faces": [[64, 41, 40]], + "name": "right inner upper eye", + "gradient": "right-inner-eye-gradient" + } + ], + "gradients": { + "left-inner-eye-gradient": { + "type": "linear", + "x1": "41.97721822541966%", + "y1": "67.79239690721649%", + "x2": "44.56654676258992%", + "y2": "67.79239690721649%", + "gradientUnits": "userSpaceOnUse", + "stops": [ + { + "stop-color": "#6D95F9" + }, + { + "offset": "0.5281", + "stop-color": "#6D95F9" + }, + { + "offset": "0.8987", + "stop-color": "#6D95F9" + }, + { + "offset": "1", + "stop-color": "#6D95F9" + } + ] + }, + "right-inner-eye-gradient": { + "type": "linear", + "x1": "56.72805755395684%", + "y1": "81.08904639175258%", + "x2": "56.72805755395684%", + "y2": "54.49574742268041%", + "gradientUnits": "userSpaceOnUse", + "stops": [ + { + "stop-color": "#6D95F9" + }, + { + "offset": "0.5281", + "stop-color": "#6D95F9" + }, + { + "offset": "0.8987", + "stop-color": "#6D95F9" + }, + { + "offset": "1", + "stop-color": "#6D95F9" + } + ] + }, + "left-middle-cheek-gradient": { + "type": "linear", + "x1": "25.107913669064747%", + "y1": "72.68865979381442%", + "x2": "25.107913669064747%", + "y2": "89.44690721649484%", + "gradientUnits": "userSpaceOnUse", + "stops": [ + { + "stop-color": "#497BF8" + }, + { + "offset": "0.3363", + "stop-color": "#497BF8" + } + ] + }, + "right-middle-cheek-gradient": { + "type": "linear", + "x1": "74.89208633093526%", + "y1": "51.32938144329896%", + "x2": "74.89208633093526%", + "y2": "94.76301546391753%", + "gradientUnits": "userSpaceOnUse", + "stops": [ + { + "stop-color": "#6D95F9" + }, + { + "offset": "0.3363", + "stop-color": "#497BF8" + } + ] + }, + "right-forehead-gradient": { + "type": "linear", + "x1": "67.00671462829736%", + "y1": "30.13930412371134%", + "x2": "67.00671462829736%", + "y2": "54.49561855670103%", + "gradientUnits": "userSpaceOnUse", + "stops": [ + { + "stop-color": "#6D95F9" + }, + { + "offset": "1", + "stop-color": "#6D95F9" + } + ] + }, + "left-forehead-gradient": { + "type": "linear", + "x1": "32.99340527577938%", + "y1": "30.13930412371134%", + "x2": "32.99340527577938%", + "y2": "54.49561855670103%", + "gradientUnits": "userSpaceOnUse", + "stops": [ + { + "stop-color": "#6D95F9" + }, + { + "offset": "1", + "stop-color": "#6D95F9" + } + ] + }, + "right-top-ear-gradient": { + "type": "linear", + "x1": "95.056858513189448%", + "y1": "15.06958762886598%", + "x2": "57.31654676258992%", + "y2": "15.06958762886598%", + "gradientUnits": "userSpaceOnUse", + "stops": [ + { + "stop-color": "#6D95F9" + }, + { + "offset": "1", + "stop-color": "#6D95F9" + } + ] + }, + "left-top-ear-gradient": { + "type": "linear", + "x1": "4.943141486810552%", + "y1": "15.06958762886598%", + "x2": "42.68345323741008%", + "y2": "15.06958762886598%", + "gradientUnits": "userSpaceOnUse", + "stops": [ + { + "stop-color": "#6D95F9" + }, + { + "offset": "1", + "stop-color": "#6D95F9" + } + ] + }, + "left-lower-cheek-gradient": { + "type": "linear", + "x1": "15.103956834532372%", + "y1": "72.6889175257732%", + "x2": "15.103956834532372%", + "y2": "96.03221649484537%", + "gradientUnits": "userSpaceOnUse", + "stops": [ + { + "stop-color": "#6D95F9" + }, + { + "offset": "1", + "stop-color": "#B6CAFC" + } + ] + }, + "right-lower-cheek-gradient": { + "type": "linear", + "x1": "84.91570743405276%", + "y1": "72.6889175257732%", + "x2": "84.91570743405276%", + "y2": "96.03221649484537%", + "gradientUnits": "userSpaceOnUse", + "stops": [ + { + "stop-color": "#6D95F9" + }, + { + "offset": "1", + "stop-color": "#B6CAFC" + } + ] + }, + "right-outer-eye-gradient": { + "type": "linear", + "x1": "68.7720623501199%", + "y1": "63.14909793814433%", + "x2": "78.03057553956835%", + "y2": "63.14909793814433%", + "gradientUnits": "userSpaceOnUse", + "stops": [ + { + "stop-color": "#6D95F9" + }, + { + "offset": "0.5281", + "stop-color": "#6D95F9" + }, + { + "offset": "0.8987", + "stop-color": "#6D95F9" + }, + { + "offset": "1", + "stop-color": "#6D95F9" + } + ] + }, + "left-outer-eye-gradient": { + "type": "linear", + "x1": "21.969424460431654%", + "y1": "63.14909793814433%", + "x2": "31.227937649880094%", + "y2": "63.14909793814433%", + "gradientUnits": "userSpaceOnUse", + "stops": [ + { + "stop-color": "#6D95F9" + }, + { + "offset": "0.5281", + "stop-color": "#6D95F9" + }, + { + "offset": "0.8987", + "stop-color": "#6D95F9" + }, + { + "offset": "1", + "stop-color": "#6D95F9" + } + ] + }, + "left-ear-gradient": { + "type": "linear", + "x1": "50%", + "y1": "30%", + "x2": "4%", + "y2": "4%", + "gradientUnits": "userSpaceOnUse", + "stops": [ + { + "stop-color": "#6D95F9" + }, + { + "offset": "0.4286", + "stop-color": "#2C56DD" + }, + { + "offset": "0.62", + "stop-color": "#2C56DD" + }, + { + "offset": "1", + "stop-color": "#6D95F9" + } + ] + }, + "right-ear-gradient": { + "type": "linear", + "x1": "50%", + "y1": "30%", + "x2": "96%", + "y2": "4%", + "gradientUnits": "userSpaceOnUse", + "stops": [ + { + "stop-color": "#6D95F9" + }, + { + "offset": "0.4286", + "stop-color": "#2C56DD" + }, + { + "offset": "0.62", + "stop-color": "#2C56DD" + }, + { + "offset": "1", + "stop-color": "#6D95F9" + } + ] + }, + "left-below-eye-gradient": { + "type": "linear", + "x1": "30.914028776978412%", + "y1": "72.83646907216496%", + "x2": "44.56654676258992%", + "y2": "72.83646907216496%", + "gradientUnits": "userSpaceOnUse", + "stops": [ + { + "stop-color": "#6D95F9" + }, + { + "offset": "1", + "stop-color": "#B6CAFC" + } + ] + }, + "right-below-eye-gradient": { + "type": "linear", + "x1": "55.43345323741007%", + "y1": "72.83646907216496%", + "x2": "69.12517985611511%", + "y2": "72.83646907216496%", + "gradientUnits": "userSpaceOnUse", + "stops": [ + { + "stop-color": "#6D95F9" + }, + { + "offset": "1", + "stop-color": "#B6CAFC" + } + ] + }, + "left-upper-cheek-gradient": { + "type": "linear", + "x1": "16.02589928057554%", + "y1": "43.35154639175258%", + "x2": "16.02589928057554%", + "y2": "72.85773195876288%", + "gradientUnits": "userSpaceOnUse", + "stops": [ + { + "stop-color": "#B6CAFC" + }, + { + "offset": "1", + "stop-color": "#B6CAFC" + } + ] + }, + "right-upper-cheek-gradient": { + "type": "linear", + "x1": "83.99364508393285%", + "y1": "43.35154639175258%", + "x2": "83.99364508393285%", + "y2": "72.85773195876288%", + "gradientUnits": "userSpaceOnUse", + "stops": [ + { + "stop-color": "#B6CAFC" + }, + { + "offset": "1", + "stop-color": "#B6CAFC" + } + ] + }, + "forehead-gradient": { + "type": "linear", + "x1": "50%", + "y1": "12.790180412371136%", + "x2": "50%", + "y2": "81.08904639175258%", + "gradientUnits": "userSpaceOnUse", + "stops": [ + { + "stop-color": "#B6CAFC" + }, + { + "offset": "1", + "stop-color": "#B6CAFC" + } + ] + }, + "back-gradient": { + "type": "linear", + "x1": "50%", + "y1": "12.790180412371136%", + "x2": "50%", + "y2": "81.08904639175258%", + "gradientUnits": "userSpaceOnUse", + "stops": [ + { + "stop-color": "#6D95F9" + }, + { + "offset": "1", + "stop-color": "#5C5CE0" + } + ] + } + }, + "positions": [ + [111.024597, 52.604599, 46.225899], + [114.025002, 87.673302, 58.9818], + [66.192001, 80.898003, 55.394299], + [72.113297, 35.491798, 30.871401], + [97.804497, 116.560997, 73.978798], + [16.7623, 58.010899, 58.078201], + [52.608898, 30.3641, 42.556099], + [106.881401, 31.945499, 46.9133], + [113.484596, 38.6049, 49.121498], + [108.6633, 43.2332, 46.315399], + [101.216599, 15.9822, 46.308201], + [16.6605, -16.2883, 93.618698], + [40.775002, -10.2288, 85.276398], + [23.926901, -2.5103, 86.736504], + [11.1691, -7.0037, 99.377602], + [9.5692, -34.393902, 141.671997], + [12.596, 7.1655, 88.740997], + [61.180901, 8.8142, 76.996803], + [39.719501, -28.927099, 88.963799], + [13.7962, -68.575699, 132.057007], + [15.2674, -62.32, 129.688004], + [14.8446, -52.6096, 140.113007], + [12.8917, -49.771599, 144.740997], + [35.604198, -71.758003, 81.063904], + [47.462502, -68.606102, 63.369701], + [38.2486, -64.730202, 38.909901], + [-12.8917, -49.771599, 144.740997], + [-13.7962, -68.575699, 132.057007], + [17.802099, -71.758003, 81.063904], + [19.1243, -69.0168, 49.420101], + [38.2486, -66.275597, 17.776199], + [12.8928, -36.703499, 141.671997], + [109.283997, -93.589897, 27.824301], + [122.117996, -36.8894, 35.025002], + [67.7668, -30.197001, 78.417801], + [33.180698, 101.851997, 25.3186], + [9.4063, -35.589802, 150.722], + [-9.5692, -34.393902, 141.671997], + [-9.4063, -35.589802, 150.722], + [11.4565, -37.899399, 150.722], + [-12.596, 7.1655, 88.740997], + [-11.1691, -7.0037, 99.377602], + [70.236504, 62.836201, -3.9475], + [47.263401, 54.293999, -27.414801], + [28.7302, 91.731102, -24.972601], + [69.167603, 6.5862, -12.7757], + [28.7302, 49.1003, -48.3596], + [31.903, 5.692, -47.821999], + [35.075802, -34.432899, -16.280899], + [115.284103, 48.681499, 48.684101], + [110.842796, 28.4821, 49.176201], + [-19.1243, -69.0168, 49.420101], + [-38.2486, -66.275597, 17.776199], + [-111.024597, 52.604599, 46.225899], + [-72.113297, 35.491798, 30.871401], + [-66.192001, 80.898003, 55.394299], + [-114.025002, 87.673302, 58.9818], + [-97.804497, 116.560997, 73.978798], + [-52.608898, 30.3641, 42.556099], + [-16.7623, 58.010899, 58.078201], + [-106.881401, 31.945499, 46.9133], + [-108.6633, 43.2332, 46.315399], + [-113.484596, 38.6049, 49.121498], + [-101.216599, 15.9822, 46.308201], + [-16.6605, -16.2883, 93.618698], + [-23.926901, -2.5103, 86.736504], + [-40.775002, -10.2288, 85.276398], + [-61.180901, 8.8142, 76.996803], + [-39.719501, -28.927099, 88.963799], + [-14.8446, -52.6096, 140.113007], + [-15.2674, -62.32, 129.688004], + [-47.462502, -68.606102, 63.369701], + [-35.604198, -71.758003, 81.063904], + [-38.2486, -64.730202, 38.909901], + [-17.802099, -71.758003, 81.063904], + [-12.8928, -36.703499, 141.671997], + [-67.7668, -30.197001, 78.417801], + [-122.117996, -36.8894, 35.025002], + [-109.283997, -93.589897, 27.824301], + [-33.180698, 101.851997, 25.3186], + [-11.4565, -37.899399, 150.722], + [-70.236504, 62.836201, -3.9475], + [-28.7302, 91.731102, -24.972601], + [-47.263401, 54.293999, -27.414801], + [-69.167603, 6.5862, -12.7757], + [-28.7302, 49.1003, -48.3596], + [-31.903, 5.692, -47.821999], + [-35.075802, -34.432899, -16.280899], + [-115.284103, 48.681499, 48.684101], + [-110.842796, 28.4821, 49.176201] + ] +} diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index ba44d0374779..ed586e3bce49 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -141,9 +141,6 @@ import { ///: END:ONLY_INCLUDE_IN } from '../../shared/constants/permissions'; import { UI_NOTIFICATIONS } from '../../shared/notifications'; -///: BEGIN:ONLY_INCLUDE_IN(build-mmi) -import { UI_INSTITUTIONAL_NOTIFICATIONS } from '../../shared/notifications/institutional'; -///: END:ONLY_INCLUDE_IN import { MILLISECOND, SECOND } from '../../shared/constants/time'; import { ORIGIN_METAMASK, @@ -734,15 +731,9 @@ export default class MetamaskController extends EventEmitter { name: 'AnnouncementController', }); - let allAnnouncements = UI_NOTIFICATIONS; - - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - allAnnouncements = UI_INSTITUTIONAL_NOTIFICATIONS; - ///: END:ONLY_INCLUDE_IN - this.announcementController = new AnnouncementController({ messenger: announcementMessenger, - allAnnouncements, + allAnnouncements: UI_NOTIFICATIONS, state: initState.AnnouncementController, }); diff --git a/package.json b/package.json index bcc4eca0e138..a402ee9b12df 100644 --- a/package.json +++ b/package.json @@ -258,7 +258,7 @@ "@metamask/key-tree": "^9.0.0", "@metamask/keyring-controller": "^8.0.1", "@metamask/logging-controller": "^1.0.1", - "@metamask/logo": "^3.1.1", + "@metamask/logo": "^3.1.2", "@metamask/message-manager": "^7.3.0", "@metamask/metamask-eth-abis": "^3.0.0", "@metamask/name-controller": "^3.0.0", diff --git a/shared/notifications/institutional/index.js b/shared/notifications/institutional/index.js deleted file mode 100644 index 78b93399ee8b..000000000000 --- a/shared/notifications/institutional/index.js +++ /dev/null @@ -1,35 +0,0 @@ -export const UI_INSTITUTIONAL_NOTIFICATIONS = { - 1: { - id: 11, - date: '2022-08-28', - image: { - src: 'images/portfolio.svg', - }, - hideDate: true, - descriptionInBullets: true, - }, -}; - -export const getTranslatedInstitutionalUINotifications = (t, locale) => { - const formattedLocale = locale.replace('_', '-'); - return { - 1: { - ...UI_INSTITUTIONAL_NOTIFICATIONS[11], - title: 'Portfolio dashboard', - description: [ - 'Portfolio snapshots', - 'Filtering by account and network', - 'Sector and protocol allocation', - 'Improved navigation', - ], - date: new Intl.DateTimeFormat(formattedLocale).format( - new Date(UI_INSTITUTIONAL_NOTIFICATIONS[11].date), - ), - customButton: { - name: 'mmi-portfolio', - text: t('viewPortfolioDashboard'), - logo: true, - }, - }, - }; -}; diff --git a/ui/components/component-library/icon/icon.types.ts b/ui/components/component-library/icon/icon.types.ts index 1fa0880469f2..7cbf13949393 100644 --- a/ui/components/component-library/icon/icon.types.ts +++ b/ui/components/component-library/icon/icon.types.ts @@ -113,7 +113,6 @@ export enum IconName { PasswordCheck = 'password-check', People = 'people', ProgrammingArrows = 'programming-arrows', - MmmiPortfolioDashboard = 'portfolio-dashboard', Custody = 'custody', Question = 'question', Received = 'received', diff --git a/ui/helpers/utils/build-types.js b/ui/helpers/utils/build-types.js index 68811e944463..5e0ff8022976 100644 --- a/ui/helpers/utils/build-types.js +++ b/ui/helpers/utils/build-types.js @@ -2,7 +2,7 @@ import flaskJson from '../../../app/build-types/flask/images/flask-mascot.json'; ///: END:ONLY_INCLUDE_IN ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) -import mmiJson from '../../../app/build-types/mmi/images/mmi-mascot.json'; +import mmiJson from '../../../app/build-types/mmi/mmi-mascot.json'; ///: END:ONLY_INCLUDE_IN const assetList = { diff --git a/yarn.lock b/yarn.lock index adf1c6100ca0..c0148f96ad23 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4344,13 +4344,13 @@ __metadata: languageName: node linkType: hard -"@metamask/logo@npm:^3.1.1": - version: 3.1.1 - resolution: "@metamask/logo@npm:3.1.1" +"@metamask/logo@npm:^3.1.2": + version: 3.1.2 + resolution: "@metamask/logo@npm:3.1.2" dependencies: gl-mat4: "npm:1.1.4" gl-vec3: "npm:1.0.3" - checksum: 328b34d5d590bf2542587301dedc32587705b12bde471e5ce162b443b662a3728833b6ca18348700790579d45b8f639331d2eef147a6f9ea7f64e18c52a06a9d + checksum: 4233cb45692b44a466a844a33c43b94c5a07baa38a2317fadfbc2aa356198d5e85306d8c17cd9911b9b97a15cbe6496080868b1f827357a13b68664105bbe1ab languageName: node linkType: hard @@ -23883,7 +23883,7 @@ __metadata: "@metamask/key-tree": "npm:^9.0.0" "@metamask/keyring-controller": "npm:^8.0.1" "@metamask/logging-controller": "npm:^1.0.1" - "@metamask/logo": "npm:^3.1.1" + "@metamask/logo": "npm:^3.1.2" "@metamask/message-manager": "npm:^7.3.0" "@metamask/metamask-eth-abis": "npm:^3.0.0" "@metamask/name-controller": "npm:^3.0.0" From 99b0c987ed221becd8dc126670aa0270c15305ad Mon Sep 17 00:00:00 2001 From: Monte Lai Date: Fri, 6 Oct 2023 21:46:05 +0800 Subject: [PATCH 054/219] Fix SnapDelineator Proptype Error (#21233) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This PR updates the proptypes of children in the SnapDelineator component. ## **Related issues** Resolves https://github.com/MetaMask/accounts-planning/issues/67 ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [x] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- ui/components/app/snaps/snap-delineator/snap-delineator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/components/app/snaps/snap-delineator/snap-delineator.js b/ui/components/app/snaps/snap-delineator/snap-delineator.js index 20999c8e5e86..eb178cfc6b2d 100644 --- a/ui/components/app/snaps/snap-delineator/snap-delineator.js +++ b/ui/components/app/snaps/snap-delineator/snap-delineator.js @@ -80,5 +80,5 @@ export const SnapDelineator = ({ SnapDelineator.propTypes = { snapName: PropTypes.string, type: PropTypes.string, - children: PropTypes.ReactNode, + children: PropTypes.node, }; From 4abda55ad96ad1fca7346bdb8b5d983d0fb7eafc Mon Sep 17 00:00:00 2001 From: Brad Decker Date: Fri, 6 Oct 2023 09:34:19 -0500 Subject: [PATCH 055/219] Add privacy snapshot and fail E2E test on new host requested (#21172) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** Adds a flag to generate a privacy snapshot file to the run-e2e-test command that can be used to require extra scrutiny on Pull requests that add new domains/hosts to the privacy snapshot. This is achieved in two ways: 1. Without adding the `--update-privacy-snapshot` flag to the e2e test run, the test will fail if a new host is detected being accessed. 2. In a future PR `.codeowners` will be updated to add an owner for the privacy shapshot file so that when it is changed, it requires review from a subset of engineers. This prevents accidental merge without someone checking off the new host. All new hosts will need to have some sort of privacy toggle associated to allow our users to **opt in** to using the new provider. The mechanism for recording these requests is fairly straightforward. 1. The mock-e2e file was modified such that the setupMocking function returns three things. First, it returned the mockedEndpoint. mockedEndpoint is what is returned from the testSpecificMock function that some tests declare. There is no type enforcement on this, nothing guarantees that mockedEndpoint is actually a mockedEndpoint. In fact in some cases we return an array of mockedEndpoints. In some tests we return nothing. It also returns the a new function called getPrivacyReport. 2. getPrivacyReport returns the current privacyReport, which is a `Set` that forces the uniqueness of values. privacyReport is updated by a `.on('request-initiated')` handler on the mockttp instance. This handler adds the host of the request to the privacyReport by calling `.add(request.headers.host)` which will only add the string if it doesn't already exist in the set. getPrivacyReport returns a plain javascript array sorted alphanumerically. 3. in helpers, we call getPrivacyReport after the test suite is ran, and we either update the privacy snapshot if that flag was specified and there are differences in the report and the privacy snapshot, or we fail the test because it violates the snapshot. ## **Manual testing steps** 1. You can test this PR by removing one of the domains from the privacy-snapshot file and then run e2e tests without the `--update-privacy-snapshot` flag and see that it fails. 2. You can also then test the generation by running it with the flag to see that the domain returns to the snapshot. ## **Related issues** fixes MetaMask/MetaMask-planning#949 ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [x] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [x] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [x] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [x] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- privacy-snapshot.json | 36 +++++++++++++++++++++++++++ test/e2e/helpers.js | 52 +++++++++++++++++++++++++++++++++++--- test/e2e/mock-e2e.js | 54 +++++++++++++++++++++++++++++++++++++--- test/e2e/run-all.js | 10 ++++++++ test/e2e/run-e2e-test.js | 11 ++++++++ 5 files changed, 155 insertions(+), 8 deletions(-) create mode 100644 privacy-snapshot.json diff --git a/privacy-snapshot.json b/privacy-snapshot.json new file mode 100644 index 000000000000..d0395058767a --- /dev/null +++ b/privacy-snapshot.json @@ -0,0 +1,36 @@ +[ + "acl.execution.consensys.io", + "api.coingecko.com", + "api.lens.dev", + "api.segment.io", + "arbitrum-mainnet.infura.io", + "bafkreifvhjdf6ve4jfv6qytqtux5nd4nwnelioeiqx5x2ez5yrgrzk7ypi.ipfs.dweb.link", + "bafybeidxfmwycgzcp4v2togflpqh2gnibuexjy4m4qqwxp7nh3jx5zlh4y.ipfs.dweb.link", + "cdnjs.cloudflare.com", + "chainid.network", + "configuration.metamask-institutional.io", + "customnetwork.com", + "doesntexist.abc", + "execution.consensys.io", + "fonts.gstatic.com", + "gas-api.metaswap.codefi.network", + "github.com", + "localhost:8545", + "mainnet.infura.io", + "metamask.github.io", + "min-api.cryptocompare.com", + "phishing-detection.metafi.codefi.network", + "proxy.metafi.codefi.network", + "raw.githubusercontent.com", + "registry.npmjs.org", + "responsive-rpc.url", + "sentry.io", + "start.metamask.io", + "static.metafi.codefi.network", + "swap.metaswap.codefi.network", + "test.metamask-phishing.io", + "token-api.metaswap.codefi.network", + "tx-insights.metaswap.codefi.network", + "unresponsive-rpc.url", + "www.4byte.directory" +] diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js index 50d21aad2e08..252b6d0af6d0 100644 --- a/test/e2e/helpers.js +++ b/test/e2e/helpers.js @@ -1,9 +1,10 @@ const { strict: assert } = require('assert'); const path = require('path'); -const { promises: fs } = require('fs'); +const { promises: fs, writeFileSync, readFileSync } = require('fs'); const BigNumber = require('bignumber.js'); const mockttp = require('mockttp'); const detectPort = require('detect-port'); +const { difference } = require('lodash'); const createStaticServer = require('../../development/create-static-server'); const { tEn } = require('../lib/i18n-helpers'); const { setupMocking } = require('./mock-e2e'); @@ -106,9 +107,13 @@ async function withFixtures(options, testSuite) { }); } } - const mockedEndpoint = await setupMocking(mockServer, testSpecificMock, { - chainId: ganacheOptions?.chainId || 1337, - }); + const { mockedEndpoint, getPrivacyReport } = await setupMocking( + mockServer, + testSpecificMock, + { + chainId: ganacheOptions?.chainId || 1337, + }, + ); if ((await detectPort(8000)) !== 8000) { throw new Error( 'Failed to set up mock server, something else may be running on port 8000.', @@ -151,6 +156,45 @@ async function withFixtures(options, testSuite) { secondaryGanacheServer, mockedEndpoint, }); + + // Evaluate whether any new hosts received network requests during E2E test + // suite execution. If so, fail the test unless the + // --update-privacy-snapshot was specified. In that case, update the + // snapshot file. + const privacySnapshotRaw = readFileSync('./privacy-snapshot.json'); + const privacySnapshot = JSON.parse(privacySnapshotRaw); + const privacyReport = getPrivacyReport(); + + // We must add to our privacyReport all of the known hosts that are + // included in the privacySnapshot. If no new hosts were requested during + // this test suite execution, then the mergedReport and the privacySnapshot + // should be identical. + const mergedReport = [ + ...new Set([...privacyReport, ...privacySnapshot]), + ].sort(); + + // To determine if a new host was requsted, we use the lodash difference + // method to generate an array of the items included in the first argument + // but not in the second + const newHosts = difference(mergedReport, privacySnapshot); + + if (newHosts.length > 0) { + if (process.env.UPDATE_PRIVACY_SNAPSHOT === 'true') { + writeFileSync( + './privacy-snapshot.json', + JSON.stringify(mergedReport, null, 2), + ); + } else { + throw new Error( + `A new host not contained in the privacy-snapshot received a network + request during test execution. Please update the privacy-snapshot + file by passing the --update-privacy-snapshot option to the test + command or add the new hosts to the snapshot manually. + + New hosts found: ${newHosts}.`, + ); + } + } } catch (error) { failed = true; if (webDriver) { diff --git a/test/e2e/mock-e2e.js b/test/e2e/mock-e2e.js index 91a32c5c5fdb..4d932ebdf1f0 100644 --- a/test/e2e/mock-e2e.js +++ b/test/e2e/mock-e2e.js @@ -8,16 +8,38 @@ const { mockEmptyStalelistAndHotlist, } = require('./tests/phishing-controller/mocks'); +/** + * The browser makes requests to domains within its own namespace for + * functionality specific to the browser. For example when running E2E tests in + * firefox the act of adding the extension from the firefox settins triggers + * a series of requests to various mozilla.net or mozilla.com domains. These + * are not requests that the extension itself makes. + */ +const browserAPIRequestDomains = + /^.*\.(googleapis\.com|google\.com|mozilla\.net|mozilla\.com|gvt1\.com)$/iu; + +/** + * @typedef {import('mockttp').Mockttp} Mockttp + * @typedef {import('mockttp').MockedEndpoint} MockedEndpoint + */ + +/** + * @typedef {object} SetupMockReturn + * @property {MockedEndpoint} mockedEndpoint - If a testSpecificMock was provided, returns the mockedEndpoint + * @property {() => string[]} getPrivacyReport - A function to get the current privacy report. + */ + /** * Setup E2E network mocks. * - * @param {object} server - The mock server used for network mocks. - * @param {Function} testSpecificMock - A function for setting up test-specific network mocks + * @param {Mockttp} server - The mock server used for network mocks. + * @param {(server: Mockttp) => MockedEndpoint} testSpecificMock - A function for setting up test-specific network mocks * @param {object} options - Network mock options. * @param {string} options.chainId - The chain ID used by the default configured network. - * @returns + * @returns {SetupMockReturn} */ async function setupMocking(server, testSpecificMock, { chainId }) { + const privacyReport = new Set(); await server.forAnyRequest().thenPassThrough({ beforeRequest: (req) => { const { host } = req.headers; @@ -391,7 +413,31 @@ async function setupMocking(server, testSpecificMock, { chainId }) { await mockLensNameProvider(server); await mockTokenNameProvider(server, chainId); - return mockedEndpoint; + /** + * Returns an array of alphanumerically sorted hostnames that were requested + * during the current test suite. + * + * @returns {string[]} privacy report for the current test suite. + */ + function getPrivacyReport() { + return [...privacyReport].sort(); + } + + /** + * Listen for requests and add the hostname to the privacy report if it did + * not previously exist. This is used to track which hosts are requested + * during the current test suite and used to ask for extra scrutiny when new + * hosts are added to the privacy-snapshot.json file. We intentionally do not + * add hosts to the report that are requested as part of the browsers normal + * operation. See the browserAPIRequestDomains regex above. + */ + server.on('request-initiated', (request) => { + if (request.headers.host.match(browserAPIRequestDomains) === null) { + privacyReport.add(request.headers.host); + } + }); + + return { mockedEndpoint, getPrivacyReport }; } async function mockLensNameProvider(server) { diff --git a/test/e2e/run-all.js b/test/e2e/run-all.js index c5383103d6b2..f74ae8473cf5 100644 --- a/test/e2e/run-all.js +++ b/test/e2e/run-all.js @@ -84,6 +84,12 @@ async function main() { default: false, description: 'Update E2E snapshots', type: 'boolean', + }) + .option('update-privacy-snapshot', { + default: false, + description: + 'Update the privacy snapshot to include new hosts and paths', + type: 'boolean', }), ) .strict() @@ -99,6 +105,7 @@ async function main() { rpc, buildType, updateSnapshot, + updatePrivacySnapshot, } = argv; let testPaths; @@ -162,6 +169,9 @@ async function main() { if (updateSnapshot) { args.push('--update-snapshot'); } + if (updatePrivacySnapshot) { + args.push('--update-privacy-snapshot'); + } if (mmi) { args.push('--mmi'); } diff --git a/test/e2e/run-e2e-test.js b/test/e2e/run-e2e-test.js index ca8ee6966ccd..4f1b3d66619a 100644 --- a/test/e2e/run-e2e-test.js +++ b/test/e2e/run-e2e-test.js @@ -52,6 +52,12 @@ async function main() { description: 'Update E2E snapshots', type: 'boolean', }) + .option('update-privacy-snapshot', { + default: false, + description: + 'Update the privacy snapshot to include new hosts and paths', + type: 'boolean', + }) .positional('e2e-test-path', { describe: 'The path for the E2E test to run.', type: 'string', @@ -70,6 +76,7 @@ async function main() { retryUntilFailure, leaveRunning, updateSnapshot, + updatePrivacySnapshot, } = argv; if (!browser) { @@ -119,6 +126,10 @@ async function main() { process.env.UPDATE_SNAPSHOTS = 'true'; } + if (updatePrivacySnapshot) { + process.env.UPDATE_PRIVACY_SNAPSHOT = 'true'; + } + const configFile = path.join(__dirname, '.mocharc.js'); const extraArgs = process.env.E2E_ARGS?.split(' ') || []; From a87190e50d771ec80bf0e8a1a3ac4d6cb778dc3f Mon Sep 17 00:00:00 2001 From: Monte Lai Date: Sat, 7 Oct 2023 00:26:23 +0800 Subject: [PATCH 056/219] Feature: Set different Keyring Snap Registry for Main and Flask builds (#21226) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This PR sets different keyring snap registry urls for main and flask builds. ## **Related issues** Resolves https://github.com/MetaMask/accounts-planning/issues/96 ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [ ] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- builds.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/builds.yml b/builds.yml index c096b51509ec..a873ae851377 100644 --- a/builds.yml +++ b/builds.yml @@ -26,6 +26,7 @@ buildTypes: - ALLOW_LOCAL_SNAPS: false - REQUIRE_SNAPS_ALLOWLIST: true - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/2.0.1/index.html + - KEYRING_SNAPS_REGISTRY_URL: https://metamask.github.io/keyring-snaps-registry/prod/registry.json # Main build uses the default browser manifest manifestOverrides: false @@ -63,6 +64,7 @@ buildTypes: - SUPPORT_REQUEST_LINK: https://metamask-flask.zendesk.com/hc/en-us/requests/new - INFURA_ENV_KEY_REF: INFURA_FLASK_PROJECT_ID - SEGMENT_WRITE_KEY_REF: SEGMENT_FLASK_WRITE_KEY + - KEYRING_SNAPS_REGISTRY_URL: https://metamask.github.io/keyring-snaps-registry/dev/registry.json isPrerelease: true manifestOverrides: ./app/build-types/flask/manifest/ @@ -82,6 +84,7 @@ buildTypes: - SUPPORT_REQUEST_LINK: https://metamask-flask.zendesk.com/hc/en-us/requests/new - INFURA_ENV_KEY_REF: INFURA_FLASK_PROJECT_ID - SEGMENT_WRITE_KEY_REF: SEGMENT_FLASK_WRITE_KEY + - KEYRING_SNAPS_REGISTRY_URL: https://metamask.github.io/keyring-snaps-registry/prod/registry.json isPrerelease: true manifestOverrides: ./app/build-types/desktop/manifest/ @@ -156,8 +159,6 @@ features: dest: images - ./{app,shared,ui}/**/flask/** keyring-snaps: - env: - - KEYRING_SNAPS_REGISTRY_URL: https://metamask.github.io/keyring-snaps-registry/prod/registry.json assets: - ./{app,shared,ui}/**/keyring-snaps/** From 9db11dc307df0264915b3150003aba5199b13dc8 Mon Sep 17 00:00:00 2001 From: Peter <53189696+PeterYinusa@users.noreply.github.com> Date: Fri, 6 Oct 2023 17:28:16 +0100 Subject: [PATCH 057/219] backup and restore testing scenarios documentation (#21212) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** _Write a short description of the changes included in this pull request, also include relevant motivation and context. Have in mind the following questions:_ _1. What is the reason for the change?_ _2. What is the improvement/solution?_ Fixes #18939 Review [backup user data.csv](https://github.com/MetaMask/metamask-extension/blob/backup-testing-scenarios/test/scenarios/8.%20backup/backup%20user%20data.csv) [restore user data.csv ](https://github.com/MetaMask/metamask-extension/blob/backup-testing-scenarios/test/scenarios/8.%20backup/restore%20user%20data.csv) ## **Manual testing steps** _1. Step1:_ _2. Step2:_ _3. ..._ ## **Screenshots/Recordings** _If applicable, add screenshots and/or recordings to visualize the before and after of your change._ ### **Before** _[screenshot]_ ### **After** _[screenshot]_ ## **Related issues** _Fixes #???_ ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've clearly explained: - [ ] What problem this PR is solving. - [ ] How this problem was solved. - [ ] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- test/scenarios/8. backup/backup user data.csv | 13 +++++++++++++ test/scenarios/8. backup/restore user data.csv | 13 +++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 test/scenarios/8. backup/backup user data.csv create mode 100644 test/scenarios/8. backup/restore user data.csv diff --git a/test/scenarios/8. backup/backup user data.csv b/test/scenarios/8. backup/backup user data.csv new file mode 100644 index 000000000000..a3f46ecda05c --- /dev/null +++ b/test/scenarios/8. backup/backup user data.csv @@ -0,0 +1,13 @@ +Step,Test Steps,Test Data,Expected Result,Notes +1,Open the extension.,,The Welcome Back screen is shown., +2,Proceed to Unlock the wallet.,password (8 characters min).,"The Ether balance is shown on the overview. +The wallet address is shown on the overview. +The selected network is Ethereum Mainnet.", +3,Select Expand view in the wallet menu.,,"A new tab opens. +The expanded extension view is shown.", +4,Proceed to open the Accounts options menu.,,The accounts menu popover is shown., +5,Proceed to General in the Settings menu.,,The General settings are displayed., +6,Change the Theme option.,e.g. Dark.,The extension background is Dark. , +7,Proceed to Advanced in the Settings menu.,,The Advanced settings are displayed., +8,Proceed to Backup your data.,,"Your user data is saved to disk. +The data payload is valid JSON and the Preferences object contains the Theme property with the value Dark.", \ No newline at end of file diff --git a/test/scenarios/8. backup/restore user data.csv b/test/scenarios/8. backup/restore user data.csv new file mode 100644 index 000000000000..c1ab84a6c3ff --- /dev/null +++ b/test/scenarios/8. backup/restore user data.csv @@ -0,0 +1,13 @@ +Step,Test Steps,Preconditions,Test Data,Expected Result,Notes +1,Open the extension.,,,The Welcome Back screen is shown., +2,Proceed to Unlock the wallet.,,password (8 characters min).,"The Ether balance is shown on the overview. +The wallet address is shown on the overview. +The selected network is Ethereum Mainnet.", +3,Select Expand view in the wallet menu.,,,"A new tab opens. +The expanded extension view is shown.", +4,Proceed to open the Accounts options menu.,,,The accounts menu popover is shown., +5,Proceed to General in the Settings menu.,,,The General settings are displayed., +6,Change the Theme option.,,e.g. Light.,The extension background is Light. , +7,Proceed to Advanced in the Settings menu.,,,The Advanced settings are displayed., +8,Proceed to Restore your data.,A user data backup exists with the theme set to Dark.,,"A success message appears to confirm the restore operation. +The extension background is Dark.", \ No newline at end of file From ce46e0585fd48ba691167a3e5eea0ef94c3a21e4 Mon Sep 17 00:00:00 2001 From: Peter <53189696+PeterYinusa@users.noreply.github.com> Date: Fri, 6 Oct 2023 17:28:25 +0100 Subject: [PATCH 058/219] metrics testing scenarios documentation (#21211) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** _Write a short description of the changes included in this pull request, also include relevant motivation and context. Have in mind the following questions:_ _1. What is the reason for the change?_ _2. What is the improvement/solution?_ Fixes #18932 Review [send event metrics.csv](https://github.com/MetaMask/metamask-extension/blob/metrics-testing-scenarios/test/scenarios/9.%20metrics/send%20event%20metrics.csv) ## **Manual testing steps** _1. Step1:_ _2. Step2:_ _3. ..._ ## **Screenshots/Recordings** _If applicable, add screenshots and/or recordings to visualize the before and after of your change._ ### **Before** _[screenshot]_ ### **After** _[screenshot]_ ## **Related issues** _Fixes #???_ ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've clearly explained: - [ ] What problem this PR is solving. - [ ] How this problem was solved. - [ ] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- .../9. metrics/send event metrics.csv | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 test/scenarios/9. metrics/send event metrics.csv diff --git a/test/scenarios/9. metrics/send event metrics.csv b/test/scenarios/9. metrics/send event metrics.csv new file mode 100644 index 000000000000..6a850c6c623e --- /dev/null +++ b/test/scenarios/9. metrics/send event metrics.csv @@ -0,0 +1,18 @@ +Step,Test Steps,Test Data,Expected Result,Notes +1,Open the extension.,,The Welcome Back screen is shown., +2,Proceed to Unlock the wallet.,password (8 characters min).,"The Ether balance is shown on the overview. +The wallet address is shown on the overview. +The selected network is Ethereum Mainnet.", +3,Select Expand view in the wallet menu.,,"A new tab opens. +The expanded extension view is shown.", +4,Proceed to open the Accounts options menu.,,The accounts menu popover is shown., +5,Proceed to Security & Privacy in the Settings menu.,,The Security & privacy settings are displayed., +6,Ensure the Participate in MetaMetrics setting is enabled.,,, +7,Navigate to the browsers extension page in another tab.,"Firefox: about:addons +Chrome: chrome://extensions/",The extensions page is displayed., +8,Enable developer mode/debug addons.,,, +9,Inspect background.html using the browsers developer tools.,,The browsers developer tools window opens., +10,Select the Network tab.,,, +11,Close the browsers extension page and switch back to the wallet.,,, +12,Proceed to General in the Settings menu.,,"A request to Sentry is made - https://api.segment.io/v1/batch. +The request payload is valid JSON and contains the name General Settings Page.", \ No newline at end of file From 7d19d9aefa1e5b587eb436d369b151855805afaa Mon Sep 17 00:00:00 2001 From: Peter <53189696+PeterYinusa@users.noreply.github.com> Date: Fri, 6 Oct 2023 17:28:34 +0100 Subject: [PATCH 059/219] address book testing scenarios documentation (#21210) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** _Write a short description of the changes included in this pull request, also include relevant motivation and context. Have in mind the following questions:_ _1. What is the reason for the change?_ _2. What is the improvement/solution?_ Fixes #18935 Review [add a contact to the address book.csv](https://github.com/MetaMask/metamask-extension/blob/address-book-testing-scenarios/test/scenarios/10.%20address-book/add%20a%20contact%20to%20the%20address%20book.csv) [remove a contact from the address book.csv](https://github.com/MetaMask/metamask-extension/blob/address-book-testing-scenarios/test/scenarios/10.%20address-book/remove%20a%20contact%20from%20the%20address%20book.csv) [update a contact in the address book.csv](https://github.com/MetaMask/metamask-extension/blob/address-book-testing-scenarios/test/scenarios/10.%20address-book/update%20a%20contact%20in%20the%20address%20book.csv) ## **Manual testing steps** _1. Step1:_ _2. Step2:_ _3. ..._ ## **Screenshots/Recordings** _If applicable, add screenshots and/or recordings to visualize the before and after of your change._ ### **Before** _[screenshot]_ ### **After** _[screenshot]_ ## **Related issues** _Fixes #???_ ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've clearly explained: - [ ] What problem this PR is solving. - [ ] How this problem was solved. - [ ] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- .../add a contact to the address book.csv | 15 +++++++++++++++ .../remove a contact from the address book.csv | 12 ++++++++++++ .../update a contact in the address book.csv | 15 +++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 test/scenarios/10. address-book/add a contact to the address book.csv create mode 100644 test/scenarios/10. address-book/remove a contact from the address book.csv create mode 100644 test/scenarios/10. address-book/update a contact in the address book.csv diff --git a/test/scenarios/10. address-book/add a contact to the address book.csv b/test/scenarios/10. address-book/add a contact to the address book.csv new file mode 100644 index 000000000000..67a63e88c1e2 --- /dev/null +++ b/test/scenarios/10. address-book/add a contact to the address book.csv @@ -0,0 +1,15 @@ +Step,Test Steps,Test Data,Expected Result,Notes +1,Open the extension.,,The Welcome Back screen is shown., +2,Proceed to Unlock the wallet.,password (8 characters min).,"The Ether balance is shown on the overview. +The wallet address is shown on the overview. +The selected network is Ethereum Mainnet.", +3,Select Expand view in the wallet menu.,,"A new tab opens. +The expanded extension view is shown.", +4,Proceed to open the Accounts options menu.,,The accounts menu popover is shown., +5,Proceed to Contacts in the Settings menu.,,The contact list is displayed., +6,Proceed to Add contact.,,The New contact screen is displayed., +7,Enter a username.,e.g. Test User.,, +8,Enter a public address.,e.g. 0x56A355d3427bC2B1E22c78197AF091230919Cc2A.,, +9,Proceed to Save the contact.,,The newly added contact appears in the contact list., +10,Select the newly created contact.,,"The contact's username is displayed. +The contact's public address is displayed.", \ No newline at end of file diff --git a/test/scenarios/10. address-book/remove a contact from the address book.csv b/test/scenarios/10. address-book/remove a contact from the address book.csv new file mode 100644 index 000000000000..d5c2681eb9e9 --- /dev/null +++ b/test/scenarios/10. address-book/remove a contact from the address book.csv @@ -0,0 +1,12 @@ +Step,Test Steps,Preconditions,Test Data,Expected Result,Notes +1,Open the extension.,,,The Welcome Back screen is shown., +2,Proceed to Unlock the wallet.,,password (8 characters min).,"The Ether balance is shown on the overview. +The wallet address is shown on the overview. +The selected network is Ethereum Mainnet.", +3,Select Expand view in the wallet menu.,,,"A new tab opens. +The expanded extension view is shown.", +4,Proceed to open the Accounts options menu.,,,The accounts menu popover is shown., +5,Proceed to Contacts in the Settings menu.,,,The contact list is displayed., +6,Select a contact in the contact list.,A contact exists in the contact list.,,The view contact screen is displayed., +7,Proceed to Edit the contact.,,,The edit contact screen is displayed., +8,Proceed to Delete the contact.,,,The deleted contact does not appear in the contact list., \ No newline at end of file diff --git a/test/scenarios/10. address-book/update a contact in the address book.csv b/test/scenarios/10. address-book/update a contact in the address book.csv new file mode 100644 index 000000000000..41b3b6de7251 --- /dev/null +++ b/test/scenarios/10. address-book/update a contact in the address book.csv @@ -0,0 +1,15 @@ +Step,Test Steps,Preconditions,Test Data,Expected Result,Notes +1,Open the extension.,,,The Welcome Back screen is shown., +2,Proceed to Unlock the wallet.,,password (8 characters min).,"The Ether balance is shown on the overview. +The wallet address is shown on the overview. +The selected network is Ethereum Mainnet.", +3,Select Expand view in the wallet menu.,,,"A new tab opens. +The expanded extension view is shown.", +4,Proceed to open the Accounts options menu.,,,The accounts menu popover is shown., +5,Proceed to Contacts in the Settings menu.,,,The contact list is displayed., +6,Select a contact in the contact list.,A contact exists in the contact list.,,The view contact screen is displayed., +7,Proceed to Edit the contact.,,,The edit contact screen is displayed., +8,Update the username.,,e.g. Test User 1.,, +9,Proceed to Save the contact.,,,The newly updated contact appears in the contact list., +10,Select the newly updated contact.,,,"The contact's username is displayed. +The contact's public address is displayed.", \ No newline at end of file From 1ae85dedbeeecd4c528574a71d9b4aa44cd6a079 Mon Sep 17 00:00:00 2001 From: Garrett Bear Date: Fri, 6 Oct 2023 09:46:57 -0700 Subject: [PATCH 060/219] Headerbase support ellipsis children components (#21217) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** 1. What is the reason for the change? HeaderBase needs to support an ellipsis option for the center/children. 2. What is the improvement/solution? Instead of setting the width to full for the center, we utilize the calculations to set the width. ## **Manual testing steps** `yarn jest ui/components/component-library/header-base` ## **Screenshots/Recordings** ### **Before** Screenshot 2023-10-05 at 3 52 55 PM ### **After** Screenshot 2023-10-05 at 3 53 05 PM ## **Related issues** This _improves_ any components using HeaderBase such as PopoverHeader and ModalHeader, but this shouldn't have any impact on their current usage. ## **Pre-merge author checklist** - [X] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [X] I've clearly explained: - [X] What problem this PR is solving. - [X] How this problem was solved. - [X] How reviewers can test my changes. - [X] I’ve indicated what issue this PR is linked to: Fixes #??? - [X] I’ve included tests if applicable. - [X] I’ve documented any added code. - [X] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [X] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [X] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [X] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [X] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- .../__snapshots__/name-details.test.tsx.snap | 6 ++-- .../__snapshots__/header-base.test.tsx.snap | 2 +- .../header-base/header-base.stories.tsx | 35 +++++++++++++++++++ .../header-base/header-base.tsx | 12 ++++--- .../__snapshots__/modal-header.test.tsx.snap | 2 +- .../popover-header.test.tsx.snap | 2 +- 6 files changed, 49 insertions(+), 10 deletions(-) diff --git a/ui/components/app/name/name-details/__snapshots__/name-details.test.tsx.snap b/ui/components/app/name/name-details/__snapshots__/name-details.test.tsx.snap index f26559cf09eb..aa11c7659316 100644 --- a/ui/components/app/name/name-details/__snapshots__/name-details.test.tsx.snap +++ b/ui/components/app/name/name-details/__snapshots__/name-details.test.tsx.snap @@ -51,7 +51,7 @@ exports[`NameDetails renders proposed names 1`] = `
should render HeaderBase element correctly
diff --git a/ui/components/component-library/header-base/header-base.stories.tsx b/ui/components/component-library/header-base/header-base.stories.tsx index e7f924755b3b..20509b8b5279 100644 --- a/ui/components/component-library/header-base/header-base.stories.tsx +++ b/ui/components/component-library/header-base/header-base.stories.tsx @@ -230,6 +230,41 @@ export const UseCaseDemos = (args) => ( + + children with ellipsis, startAccessory, and endAccessory assigned{' '} + + + + Unlock Now + + } + endAccessory={ + + } + {...args} + > + + Title is sentence case no period + + + children, startAccessory, and endAccessory assigned with prop alignItems= {AlignItems.center} passed at HeaderBase diff --git a/ui/components/component-library/header-base/header-base.tsx b/ui/components/component-library/header-base/header-base.tsx index 371340762332..d5b00ab362aa 100644 --- a/ui/components/component-library/header-base/header-base.tsx +++ b/ui/components/component-library/header-base/header-base.tsx @@ -1,7 +1,6 @@ import React, { useRef, useEffect, useMemo, useState } from 'react'; import classnames from 'classnames'; import { - BlockSize, Display, JustifyContent, } from '../../../helpers/constants/design-system'; @@ -55,13 +54,19 @@ export const HeaderBase: HeaderBaseComponent = React.forwardRef( }, [startAccessoryRef, endAccessoryRef, children]); const getTitleStyles = useMemo(() => { - if (startAccessory && !endAccessory) { + if (startAccessory && !endAccessory && accessoryMinWidth) { return { marginRight: `${accessoryMinWidth}px`, + width: `calc(100% - ${accessoryMinWidth * 2}px)`, }; - } else if (!startAccessory && endAccessory) { + } else if (!startAccessory && endAccessory && accessoryMinWidth) { return { marginLeft: `${accessoryMinWidth}px`, + width: `calc(100% - ${accessoryMinWidth * 2}px)`, + }; + } else if (startAccessory && endAccessory && accessoryMinWidth) { + return { + width: `calc(100% - ${accessoryMinWidth * 2}px)`, }; } return {}; @@ -92,7 +97,6 @@ export const HeaderBase: HeaderBaseComponent = React.forwardRef( )} {children && ( )} > diff --git a/ui/components/component-library/modal-header/__snapshots__/modal-header.test.tsx.snap b/ui/components/component-library/modal-header/__snapshots__/modal-header.test.tsx.snap index c927dbe363a6..840d417ee2c5 100644 --- a/ui/components/component-library/modal-header/__snapshots__/modal-header.test.tsx.snap +++ b/ui/components/component-library/modal-header/__snapshots__/modal-header.test.tsx.snap @@ -7,7 +7,7 @@ exports[`ModalHeader should render ModalHeader correctly 1`] = ` data-testid="modal-header" >

Date: Sat, 7 Oct 2023 00:58:32 +0800 Subject: [PATCH 061/219] Fix/ap 63/add message to loading for hw and snap accounts (#21229) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This PR adds a loading message to the loading indicator for Hardware Wallet and Snap Accounts. Previously, when a transaction was made and not confirmed on the device, MetaMask would stay in a loading state indefinitely, which could be confusing for users. With this change, a loading message is displayed to indicate that the transaction is waiting for confirmation on the device. This improves the user experience and makes it clear that the transaction is still in progress. ## **Manual testing steps** 1. Using a Snap (using async flow) or HW account 2. Click send 3. Send any amount of eth and confirm transaction 4. Don't approve the transaction on the hardware device or snap account 5. See the new loading message ## **Screenshots/Recordings** ### **Before** ![snap-loading-screen2](https://github.com/MetaMask/metamask-extension/assets/96463427/9fadbca7-682a-4ace-81b3-9b62289f453e) ### **After** ![snap-loading-screen](https://github.com/MetaMask/metamask-extension/assets/96463427/5b035bdd-a345-4814-9a34-739298e37378) ## **Related issues** Resolves https://github.com/MetaMask/accounts-planning/issues/63 ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [x] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [x] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [x] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [x] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- app/_locales/en/messages.json | 6 ++++ .../loading-screen.component.js | 11 ++++--- .../confirm-transaction-base.component.js | 31 ++++++++++++++++++- .../confirm-transaction-base.container.js | 17 ++++++++-- .../confirm-transaction.test.js.snap | 7 +++-- ui/store/actions.ts | 4 ++- 6 files changed, 65 insertions(+), 11 deletions(-) diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 4d96c5508835..d7fc206ef926 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -2280,6 +2280,12 @@ "loadingNFTs": { "message": "Loading NFTs..." }, + "loadingScreenHardwareWalletMessage": { + "message": "Please complete the transaction on the hardware wallet." + }, + "loadingScreenSnapMessage": { + "message": "Please complete the transaction on the Snap." + }, "loadingTokens": { "message": "Loading tokens..." }, diff --git a/ui/components/ui/loading-screen/loading-screen.component.js b/ui/components/ui/loading-screen/loading-screen.component.js index 2aba5453b9cb..6461b89aaf8c 100644 --- a/ui/components/ui/loading-screen/loading-screen.component.js +++ b/ui/components/ui/loading-screen/loading-screen.component.js @@ -1,6 +1,7 @@ import React, { isValidElement } from 'react'; import PropTypes from 'prop-types'; import Spinner from '../spinner'; +import { Box } from '../../component-library'; const LoadingScreen = ({ header, @@ -20,18 +21,18 @@ const LoadingScreen = ({ }; return ( -
+ {header} -
+ {showLoadingSpinner && ( )} - {renderMessage()} -
-
+ + {renderMessage()} + ); }; diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js index 6b8a8023c0a1..b974952474b3 100644 --- a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js +++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js @@ -55,6 +55,10 @@ import { ConfirmTitle } from '../../components/app/confirm-title'; import { ConfirmSubTitle } from '../../components/app/confirm-subtitle'; import { ConfirmGasDisplay } from '../../components/app/confirm-gas-display'; import updateTxData from '../../../shared/modules/updateTxData'; +///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) +import { KeyringType } from '../../../shared/constants/keyring'; +///: END:ONLY_INCLUDE_IN +import { isHardwareKeyring } from '../../helpers/utils/hardware'; export default class ConfirmTransactionBase extends Component { static contextTypes = { @@ -96,6 +100,7 @@ export default class ConfirmTransactionBase extends Component { unapprovedTxCount: PropTypes.number, customGas: PropTypes.object, addToAddressBookIfNew: PropTypes.func, + keyringForAccount: PropTypes.object, // Component props actionKey: PropTypes.string, contentComponent: PropTypes.node, @@ -630,8 +635,28 @@ export default class ConfirmTransactionBase extends Component { addToAddressBookIfNew, toAccounts, toAddress, + keyringForAccount, } = this.props; + let loadingIndicatorMessage; + + switch (keyringForAccount?.type) { + ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) + case KeyringType.snap: + loadingIndicatorMessage = this.context.t('loadingScreenSnapMessage'); + break; + ///: END:ONLY_INCLUDE_IN + default: + if (isHardwareKeyring(keyringForAccount?.type)) { + loadingIndicatorMessage = this.context.t( + 'loadingScreenHardwareWalletMessage', + ); + } else { + loadingIndicatorMessage = null; + } + break; + } + updateTxData({ txData, maxFeePerGas, @@ -654,7 +679,11 @@ export default class ConfirmTransactionBase extends Component { () => { this._removeBeforeUnload(); - sendTransaction(txData) + sendTransaction( + txData, + false, // hideLoadingIndicator + loadingIndicatorMessage, // loadingIndicatorMessage + ) .then(() => { if (!this._isMounted) { return; diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js index 5265d3b14cc9..053732c80cd3 100644 --- a/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js +++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js @@ -51,6 +51,7 @@ import { getNativeCurrency, getSendToAccounts, getProviderConfig, + findKeyringForAddress, } from '../../ducks/metamask/metamask'; import { addHexPrefix, @@ -145,6 +146,7 @@ const mapStateToProps = (state, ownProps) => { const { balance } = accounts[fromAddress]; const { name: fromName } = identities[fromAddress]; + const keyring = findKeyringForAddress(state, fromAddress); const isSendingAmount = type === TransactionType.simpleSend || !isEmptyHexString(amount); @@ -276,6 +278,7 @@ const mapStateToProps = (state, ownProps) => { chainId, isBuyableChain, useCurrencyRateCheck: getUseCurrencyRateCheck(state), + keyringForAccount: keyring, ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) accountType, isNoteToTraderSupported, @@ -310,8 +313,18 @@ export const mapDispatchToProps = (dispatch) => { }, cancelTransaction: ({ id }) => dispatch(cancelTx({ id })), cancelAllTransactions: (txList) => dispatch(cancelTxs(txList)), - sendTransaction: (txData) => - dispatch(updateAndApproveTx(customNonceMerge(txData))), + sendTransaction: ( + txData, + dontShowLoadingIndicator, + loadingIndicatorMessage, + ) => + dispatch( + updateAndApproveTx( + customNonceMerge(txData), + dontShowLoadingIndicator, + loadingIndicatorMessage, + ), + ), getNextNonce: () => dispatch(getNextNonce()), setDefaultHomeActiveTabName: (tabName) => dispatch(setDefaultHomeActiveTabName(tabName)), diff --git a/ui/pages/confirm-transaction/__snapshots__/confirm-transaction.test.js.snap b/ui/pages/confirm-transaction/__snapshots__/confirm-transaction.test.js.snap index c339a0457676..e120b674d476 100644 --- a/ui/pages/confirm-transaction/__snapshots__/confirm-transaction.test.js.snap +++ b/ui/pages/confirm-transaction/__snapshots__/confirm-transaction.test.js.snap @@ -2,10 +2,10 @@ exports[`Confirmation Transaction Page should display the Loading component when the transaction is invalid 1`] = `
+
`; diff --git a/ui/store/actions.ts b/ui/store/actions.ts index 3b13d774a124..6d1347df5d9c 100644 --- a/ui/store/actions.ts +++ b/ui/store/actions.ts @@ -1039,6 +1039,7 @@ export async function addTransactionAndWaitForPublish( export function updateAndApproveTx( txMeta: TransactionMeta, dontShowLoadingIndicator: boolean, + loadingIndicatorMessage: string, ): ThunkAction< Promise, MetaMaskReduxState, @@ -1046,7 +1047,8 @@ export function updateAndApproveTx( AnyAction > { return (dispatch: MetaMaskReduxDispatch) => { - !dontShowLoadingIndicator && dispatch(showLoadingIndication()); + !dontShowLoadingIndicator && + dispatch(showLoadingIndication(loadingIndicatorMessage)); return new Promise((resolve, reject) => { const actionId = generateActionId(); callBackgroundMethod( From c32d063081e2d6cd8ca53f9a74625480554a6a47 Mon Sep 17 00:00:00 2001 From: Bowen Sanders Date: Fri, 6 Oct 2023 10:10:56 -0700 Subject: [PATCH 062/219] [FLASK] Create E2E for revoking snap permission (#21199) This creates a test for revoking a permission through the snap settings. --- test/e2e/snaps/test-snap-revoke-perm.spec.js | 193 ++++++++++++++++++ .../permission-cell-options.js | 1 + 2 files changed, 194 insertions(+) create mode 100644 test/e2e/snaps/test-snap-revoke-perm.spec.js diff --git a/test/e2e/snaps/test-snap-revoke-perm.spec.js b/test/e2e/snaps/test-snap-revoke-perm.spec.js new file mode 100644 index 000000000000..8001a41a8949 --- /dev/null +++ b/test/e2e/snaps/test-snap-revoke-perm.spec.js @@ -0,0 +1,193 @@ +const { withFixtures } = require('../helpers'); +const FixtureBuilder = require('../fixture-builder'); +const { TEST_SNAPS_WEBSITE_URL } = require('./enums'); + +describe('Test Snap revoke permission', function () { + it('can revoke a permission', async function () { + const ganacheOptions = { + accounts: [ + { + secretKey: + '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC', + balance: 25000000000000000000, + }, + ], + }; + await withFixtures( + { + fixtures: new FixtureBuilder().build(), + ganacheOptions, + failOnConsoleError: false, + title: this.test.title, + }, + async ({ driver }) => { + await driver.navigate(); + + // enter pw into extension + await driver.fill('#password', 'correct horse battery staple'); + await driver.press('#password', driver.Key.ENTER); + + // navigate to test snaps page and connect + await driver.openNewPage(TEST_SNAPS_WEBSITE_URL); + await driver.delay(1000); + const snapButton = await driver.findElement( + '#connectethereum-provider', + ); + await driver.scrollToElement(snapButton); + await driver.delay(1000); + await driver.clickElement('#connectethereum-provider'); + await driver.delay(1000); + + // switch to metamask extension and click connect + const windowHandles = await driver.waitUntilXWindowHandles( + 3, + 1000, + 10000, + ); + await driver.switchToWindowWithTitle( + 'MetaMask Notification', + windowHandles, + ); + await driver.clickElement({ + text: 'Connect', + tag: 'button', + }); + + await driver.waitForSelector({ text: 'Install' }); + + await driver.clickElement({ + text: 'Install', + tag: 'button', + }); + + await driver.waitForSelector({ text: 'OK' }); + + await driver.clickElement({ + text: 'OK', + tag: 'button', + }); + + // switch to test snap page + await driver.switchToWindowWithTitle('Test Snaps', windowHandles); + + // wait for npm installation success + await driver.waitForSelector({ + css: '#connectethereum-provider', + text: 'Reconnect to Ethereum Provider Snap', + }); + + // find and click on send get version + const snapButton3 = await driver.findElement( + '#sendEthproviderAccounts', + ); + await driver.scrollToElement(snapButton3); + await driver.delay(500); + await driver.clickElement('#sendEthproviderAccounts'); + + // switch to metamask window and click through confirmations + const windowHandles2 = await driver.waitUntilXWindowHandles( + 3, + 1000, + 10000, + ); + await driver.switchToWindowWithTitle( + 'MetaMask Notification', + windowHandles2, + ); + await driver.clickElement({ + text: 'Next', + tag: 'button', + }); + await driver.delay(500); + await driver.clickElement({ + text: 'Connect', + tag: 'button', + }); + + // switch to test snap page + await driver.switchToWindowWithTitle('Test Snaps', windowHandles); + + // check the results of the message signature using waitForSelector + await driver.waitForSelector({ + css: '#ethproviderResult', + text: '"0x5cfe73b6021e818b776b421b1c4db2474086a7e1"', + }); + + // switch to the original MM tab + const extensionPage = windowHandles[0]; + await driver.switchToWindow(extensionPage); + await driver.delay(1000); + + // click on the global action menu + await driver.clickElement( + '[data-testid="account-options-menu-button"]', + ); + + // try to click on the notification item + await driver.clickElement({ text: 'Settings', tag: 'div' }); + await driver.delay(1000); + + // try to click on the snaps item + await driver.clickElement({ + text: 'Snaps', + tag: 'div', + }); + + // try to click on the Ethereum Provider Example Snap + await driver.clickElement({ + text: 'Ethereum Provider Example Snap', + tag: 'p', + }); + + // try to click on options menu + await driver.clickElement('[data-testid="eth_accounts"]'); + + // try to click on revoke permission + await driver.clickElement({ + text: 'Revoke permission', + tag: 'p', + }); + + // switch to test snap page + await driver.switchToWindowWithTitle('Test Snaps', windowHandles); + + // find and click on send get version + const snapButton4 = await driver.findElement( + '#sendEthproviderAccounts', + ); + await driver.scrollToElement(snapButton4); + await driver.delay(500); + await driver.clickElement('#sendEthproviderAccounts'); + + // switch to metamask window and click through confirmations + const windowHandles3 = await driver.waitUntilXWindowHandles( + 3, + 1000, + 10000, + ); + await driver.switchToWindowWithTitle( + 'MetaMask Notification', + windowHandles3, + ); + await driver.clickElement({ + text: 'Next', + tag: 'button', + }); + await driver.delay(500); + await driver.clickElement({ + text: 'Connect', + tag: 'button', + }); + + // switch to test snap page + await driver.switchToWindowWithTitle('Test Snaps', windowHandles); + + // check the results of the message signature using waitForSelector + await driver.waitForSelector({ + css: '#ethproviderResult', + text: '"0x5cfe73b6021e818b776b421b1c4db2474086a7e1"', + }); + }, + ); + }); +}); diff --git a/ui/components/app/permission-cell/permission-cell-options.js b/ui/components/app/permission-cell/permission-cell-options.js index ec7dda4cd5c8..5cefdf7f7d8f 100644 --- a/ui/components/app/permission-cell/permission-cell-options.js +++ b/ui/components/app/permission-cell/permission-cell-options.js @@ -55,6 +55,7 @@ export const PermissionCellOptions = ({ iconName={IconName.MoreVertical} ariaLabel={t('options')} onClick={handleOpen} + data-testid={permissionName} /> {showOptions && ( From 253b962759e4f7da86a236cd615024a086260552 Mon Sep 17 00:00:00 2001 From: jiexi Date: Fri, 6 Oct 2023 13:20:13 -0700 Subject: [PATCH 063/219] Bump @metamask/providers to v13.0.0 (#20917) ## Explanation Driven by a need to get rid of `window.ethereum.networkVersion` as a part of removing networkId work. This PR bumps `@metamask/providers` from v11.1.0 to v13.0.0, which introduces a deprecation warning when accessing `window.ethereum.networkVersion` (as well as `chainId` and `selectedAddress`). The goal is to get this into the wild, alert devs, and to finally remove these properties in the future. ~~Additionally, this PR bumps `browserify` from v16.5.1 to v17.0.0 which is required for polyfilling `streams.pipeline` which is now used in `@metamask/providers`~~ Completed in a separate PR already https://github.com/MetaMask/providers/compare/v11.1.0...v13.0.0 * Fixes: https://github.com/MetaMask/MetaMask-planning/issues/1068 * See: https://github.com/MetaMask/metamask-extension/pull/20652 ## Screenshots/Screencaps ### Before ![Screenshot 2023-09-19 at 9 36 46 AM](https://github.com/MetaMask/metamask-extension/assets/918701/3be060b8-8d76-42ae-b860-2a3d12144326) ### After ![Screenshot 2023-09-19 at 9 31 30 AM](https://github.com/MetaMask/metamask-extension/assets/918701/80676323-c8a6-4d06-bfb4-9b082cee9a64) ## Manual Testing Steps 1. Open browser console in any page 2. Enter `window.ethereum.chainId` 3. You should get the value for the current selected chain ID and a deprecation warning 4. Enter `window.ethereum.chainId` again 5. You should get the value for the current selected chain ID, but no deprecation warning this time 6. Repeat 2-6 for `window.ethereum.networkVersion` and `window.ethereum.selectedAddress` ## Pre-merge author checklist - [x] I've clearly explained: - [x] What problem this PR is solving - [x] How this problem was solved - [x] How reviewers can test my changes - [x] Sufficient automated test coverage has been added ## Pre-merge reviewer checklist - [x] Manual testing (e.g. pull and build branch, run in browser, test code being changed) - [x] PR is linked to the appropriate GitHub issue - [ ] **IF** this PR fixes a bug in the release milestone, add this PR to the release milestone If further QA is required (e.g. new feature, complex testing steps, large refactor), add the `Extension QA Board` label. In this case, a QA Engineer approval will be be required. --------- Co-authored-by: MetaMask Bot Co-authored-by: Frederik Bolding Co-authored-by: Alex Donesky --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a402ee9b12df..ac80aa6d31ce 100644 --- a/package.json +++ b/package.json @@ -269,7 +269,7 @@ "@metamask/phishing-controller": "^6.0.0", "@metamask/post-message-stream": "^6.2.0", "@metamask/ppom-validator": "^0.5.0", - "@metamask/providers": "^11.1.0", + "@metamask/providers": "^13.0.0", "@metamask/rate-limit-controller": "^3.0.0", "@metamask/rpc-methods": "^2.0.0", "@metamask/safe-event-emitter": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index c0148f96ad23..09f068146c4e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4623,7 +4623,7 @@ __metadata: languageName: node linkType: hard -"@metamask/providers@npm:^11.1.0, @metamask/providers@npm:^11.1.1": +"@metamask/providers@npm:^11.1.1": version: 11.1.2 resolution: "@metamask/providers@npm:11.1.2" dependencies: @@ -23895,7 +23895,7 @@ __metadata: "@metamask/phishing-warning": "npm:^2.1.0" "@metamask/post-message-stream": "npm:^6.2.0" "@metamask/ppom-validator": "npm:^0.5.0" - "@metamask/providers": "npm:^11.1.0" + "@metamask/providers": "npm:^13.0.0" "@metamask/rate-limit-controller": "npm:^3.0.0" "@metamask/rpc-methods": "npm:^2.0.0" "@metamask/safe-event-emitter": "npm:^2.0.0" From de35a0867dab5fe59864ae5b776f86baf7be36de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albert=20Oliv=C3=A9?= Date: Mon, 9 Oct 2023 07:19:47 +0200 Subject: [PATCH 064/219] [MMI] Adding break word CSS to long names (#21204) ## **Description** Long account names should wrap within the extension width. This occurs if there are spaces in the name but if it is a long unbroken string like ffffffffffffffffffffffffffff you get this effect: ## **Screenshots/Recordings** ### **Before** **Account details** 676e2313-33b2-4dc3-8cba-3f625c5b02d0 **Connect screen** ![6a5f8841-a690-44be-aa11-53e408b49f36](https://github.com/MetaMask/metamask-extension/assets/1182864/48c08a9b-347a-45b8-9d6b-ab63bd31c79f) ### **After** **Account details** ![Screenshot 2023-10-05 at 09 37 35](https://github.com/MetaMask/metamask-extension/assets/1182864/65bb27c2-042f-44a8-932e-939f0a609632) **Connect screen** ![Screenshot 2023-10-05 at 09 37 24](https://github.com/MetaMask/metamask-extension/assets/1182864/a5f1a437-4c6d-4e85-8079-efe90026b58b) ## Pre-merge author checklist - [x] I've clearly explained: - [x] What problem this PR is solving - [x] How this problem was solved - [x] How reviewers can test my changes - [x] Sufficient automated test coverage has been added ## Pre-merge reviewer checklist - [x] Manual testing (e.g. pull and build branch, run in browser, test code being changed) - [x] **IF** this PR fixes a bug in the release milestone, add this PR to the release milestone If further QA is required (e.g. new feature, complex testing steps, large refactor), add the `Extension QA Board` label. In this case, a QA Engineer approval will be be required. --- .../app/connected-accounts-list/index.scss | 1 + ui/components/ui/editable-label/editable-label.js | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ui/components/app/connected-accounts-list/index.scss b/ui/components/app/connected-accounts-list/index.scss index 89d91ea30d8d..449a39978062 100644 --- a/ui/components/app/connected-accounts-list/index.scss +++ b/ui/components/app/connected-accounts-list/index.scss @@ -5,6 +5,7 @@ &__row { width: 100%; + word-break: break-word; } &__row-content { diff --git a/ui/components/ui/editable-label/editable-label.js b/ui/components/ui/editable-label/editable-label.js index 80a032450f6c..e296d10626ad 100644 --- a/ui/components/ui/editable-label/editable-label.js +++ b/ui/components/ui/editable-label/editable-label.js @@ -4,7 +4,7 @@ import PropTypes from 'prop-types'; import { AlignItems, Color, - DISPLAY, + Display, TextVariant, } from '../../../helpers/constants/design-system'; import { getAccountNameErrorMessage } from '../../../helpers/utils/accounts'; @@ -53,7 +53,7 @@ export default class EditableLabel extends Component { return ( - {this.state.value} + + + {this.state.value} + Date: Mon, 9 Oct 2023 00:42:03 -0700 Subject: [PATCH 065/219] fix: improve the flakiest e2e tests (#21110) Tries to tackle some of the highest tests on the Flaky List --- test/e2e/flask/petnames.spec.js | 27 ++++---- test/e2e/helpers.js | 28 ++++---- .../e2e/metrics/transaction-finalized.spec.js | 6 +- .../mv3/phishing-warning-sw-restart.spec.js | 4 +- test/e2e/swaps/swaps-notifications.spec.js | 5 +- test/e2e/tests/metamask-responsive-ui.spec.js | 4 +- test/e2e/tests/multiple-transactions.spec.js | 15 +++-- test/e2e/tests/onboarding.spec.js | 4 +- test/e2e/tests/send-eth.spec.js | 4 +- test/e2e/tests/send-hex-address.spec.js | 67 +++++++++---------- 10 files changed, 80 insertions(+), 84 deletions(-) diff --git a/test/e2e/flask/petnames.spec.js b/test/e2e/flask/petnames.spec.js index 7f1a3ebc4979..5c8dd62c0d65 100644 --- a/test/e2e/flask/petnames.spec.js +++ b/test/e2e/flask/petnames.spec.js @@ -1,4 +1,9 @@ -const { withFixtures, openDapp, convertToHexValue } = require('../helpers'); +const { + convertToHexValue, + openDapp, + switchToNotificationWindow, + withFixtures, +} = require('../helpers'); const FixtureBuilder = require('../fixture-builder'); const { TEST_SNAPS_WEBSITE_URL } = require('../snaps/enums'); @@ -40,21 +45,19 @@ async function installNameLookupSnap(driver) { await driver.delay(1000); // Confirm Connect Modal - focusNotification(driver); + await switchToNotificationWindow(driver, 4); await driver.clickElement({ text: 'Connect', tag: 'button', }); // Confirm Install Modal - await driver.waitForSelector({ text: 'Install' }); await driver.clickElement({ text: 'Install', tag: 'button', }); // Success Modal - await driver.waitForSelector({ text: 'OK' }); await driver.clickElement({ text: 'OK', tag: 'button', @@ -74,12 +77,6 @@ async function rejectSignatureRequest(driver) { await driver.delay(3000); } -async function focusNotification(driver) { - const windowHandles = await driver.getAllWindowHandles(); - await driver.switchToWindowWithTitle('MetaMask Notification', windowHandles); - await driver.delay(3000); -} - async function focusTestDapp(driver) { const windowHandles = await driver.getAllWindowHandles(); await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles); @@ -166,7 +163,7 @@ describe('Petnames', function () { await login(driver); await openDapp(driver); await createSignatureRequest(driver, SIGNATURE_TYPE.TYPED_V3); - await focusNotification(driver); + await switchToNotificationWindow(driver, 3); await expectName(driver, '0xCD2a3...DD826', false); await expectName(driver, '0xbBbBB...bBBbB', false); await saveName(driver, '0xCD2a3...DD826', undefined, 'test.lens'); @@ -178,7 +175,7 @@ describe('Petnames', function () { await rejectSignatureRequest(driver); await focusTestDapp(driver); await createSignatureRequest(driver, SIGNATURE_TYPE.TYPED_V3); - await focusNotification(driver); + await switchToNotificationWindow(driver, 3); await expectName(driver, 'test.lens', true); await expectName(driver, 'test2.lens', true); await showThirdPartyDetails(driver); @@ -202,7 +199,7 @@ describe('Petnames', function () { await login(driver); await openDapp(driver); await createSignatureRequest(driver, SIGNATURE_TYPE.TYPED_V4); - await focusNotification(driver); + await switchToNotificationWindow(driver, 3); await expectName(driver, '0xCD2a3...DD826', false); await expectName(driver, '0xDeaDb...DbeeF', false); await expectName(driver, '0xbBbBB...bBBbB', false); @@ -217,7 +214,7 @@ describe('Petnames', function () { await rejectSignatureRequest(driver); await focusTestDapp(driver); await createSignatureRequest(driver, SIGNATURE_TYPE.TYPED_V4); - await focusNotification(driver); + await switchToNotificationWindow(driver, 3); await expectName(driver, 'test.lens', true); await expectName(driver, 'Test Token 2', true); await showThirdPartyDetails(driver); @@ -244,7 +241,7 @@ describe('Petnames', function () { await installNameLookupSnap(driver); await focusTestDapp(driver); await createSignatureRequest(driver, SIGNATURE_TYPE.TYPED_V4); - await focusNotification(driver); + await switchToNotificationWindow(driver, 4); await expectProposedNames(driver, '0xCD2a3...DD826', [ ['test.lens', 'Lens Protocol'], ['example.domain - 0xcd2 / 0x539', 'Name Lookup Example Snap'], diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js index 252b6d0af6d0..f7f626d990b3 100644 --- a/test/e2e/helpers.js +++ b/test/e2e/helpers.js @@ -601,8 +601,16 @@ const sendTransaction = async ( await driver.clickElement('[data-testid="eth-overview-send"]'); await driver.fill('[data-testid="ens-input"]', recipientAddress); await driver.fill('.unit-input__input', quantity); - await driver.clickElement('[data-testid="page-container-footer-next"]'); - await driver.clickElement('[data-testid="page-container-footer-next"]'); + await driver.clickElement({ + text: 'Next', + tag: 'button', + css: '[data-testid="page-container-footer-next"]', + }); + await driver.clickElement({ + text: 'Confirm', + tag: 'button', + css: '[data-testid="page-container-footer-next"]', + }); // the default is to do this block, but if we're testing an async flow, it would get stuck here if (!isAsyncFlow) { @@ -636,19 +644,10 @@ const TEST_SEED_PHRASE = const TEST_SEED_PHRASE_TWO = 'phrase upgrade clock rough situate wedding elder clever doctor stamp excess tent'; -// Usually happens when onboarded to make sure the state is retrieved from metamaskState properly -const assertAccountBalanceForDOM = async (driver, ganacheServer) => { - const balance = await ganacheServer.getBalance(); - const balanceElement = await driver.findElement( - '[data-testid="eth-overview__primary-currency"]', - ); - assert.equal(`${balance}\nETH`, await balanceElement.getText()); -}; - -// Usually happens after txn is made +// Usually happens when onboarded to make sure the state is retrieved from metamaskState properly, or after txn is made const locateAccountBalanceDOM = async (driver, ganacheServer) => { const balance = await ganacheServer.getBalance(); - await driver.waitForSelector({ + await driver.findElement({ css: '[data-testid="eth-overview__primary-currency"]', text: `${balance} ETH`, }); @@ -683,7 +682,7 @@ const unlockWallet = async (driver) => { const logInWithBalanceValidation = async (driver, ganacheServer) => { await unlockWallet(driver); - await assertAccountBalanceForDOM(driver, ganacheServer); + await locateAccountBalanceDOM(driver, ganacheServer); }; async function sleepSeconds(sec) { @@ -883,7 +882,6 @@ module.exports = { findAnotherAccountFromAccountList, unlockWallet, logInWithBalanceValidation, - assertAccountBalanceForDOM, locateAccountBalanceDOM, waitForAccountRendered, generateGanacheOptions, diff --git a/test/e2e/metrics/transaction-finalized.spec.js b/test/e2e/metrics/transaction-finalized.spec.js index b72bb0598de7..b8a77077454a 100644 --- a/test/e2e/metrics/transaction-finalized.spec.js +++ b/test/e2e/metrics/transaction-finalized.spec.js @@ -3,10 +3,10 @@ const { isEqual, omit } = require('lodash'); const { defaultGanacheOptions, withFixtures, - unlockWallet, sendTransaction, getEventPayloads, assertInAnyOrder, + logInWithBalanceValidation, } = require('../helpers'); const FixtureBuilder = require('../fixture-builder'); @@ -147,9 +147,9 @@ describe('Transaction Finalized Event', function () { title: this.test.title, testSpecificMock: mockSegment, }, - async ({ driver, mockedEndpoint: mockedEndpoints }) => { + async ({ driver, mockedEndpoint: mockedEndpoints, ganacheServer }) => { await driver.navigate(); - await unlockWallet(driver); + await logInWithBalanceValidation(driver, ganacheServer); await sendTransaction(driver, RECIPIENT, '2.0'); diff --git a/test/e2e/mv3/phishing-warning-sw-restart.spec.js b/test/e2e/mv3/phishing-warning-sw-restart.spec.js index 8de3ad7e0c60..65e9345bbd97 100644 --- a/test/e2e/mv3/phishing-warning-sw-restart.spec.js +++ b/test/e2e/mv3/phishing-warning-sw-restart.spec.js @@ -4,7 +4,7 @@ const { withFixtures, openDapp, defaultGanacheOptions, - assertAccountBalanceForDOM, + locateAccountBalanceDOM, SERVICE_WORKER_URL, regularDelayMs, WALLET_PASSWORD, @@ -60,7 +60,7 @@ describe('Phishing warning page', function () { windowHandles = await driver.getAllWindowHandles(); const extension = windowHandles[0]; await driver.switchToWindow(extension); - await assertAccountBalanceForDOM(driver, ganacheServer); + await locateAccountBalanceDOM(driver, ganacheServer); // Open the dapp site and extension detect it as phishing warning page await openDapp(driver); diff --git a/test/e2e/swaps/swaps-notifications.spec.js b/test/e2e/swaps/swaps-notifications.spec.js index 4aa0508696af..5a5a4abf44a5 100644 --- a/test/e2e/swaps/swaps-notifications.spec.js +++ b/test/e2e/swaps/swaps-notifications.spec.js @@ -119,12 +119,11 @@ describe('Swaps - notifications @no-mmi', function () { amount: 50, skipCounter: true, }); - const swapButton = await driver.waitForSelector({ + await driver.waitForSelector({ text: 'Swap', tag: 'button', + css: '[disabled]', }); - assert.equal(await swapButton.getText(), 'Swap'); - assert.equal(await swapButton.isEnabled(), false); }, ); }); diff --git a/test/e2e/tests/metamask-responsive-ui.spec.js b/test/e2e/tests/metamask-responsive-ui.spec.js index 414bede479c1..fe01902dfc15 100644 --- a/test/e2e/tests/metamask-responsive-ui.spec.js +++ b/test/e2e/tests/metamask-responsive-ui.spec.js @@ -3,7 +3,7 @@ const { TEST_SEED_PHRASE_TWO, convertToHexValue, withFixtures, - assertAccountBalanceForDOM, + locateAccountBalanceDOM, } = require('../helpers'); const FixtureBuilder = require('../fixture-builder'); @@ -109,7 +109,7 @@ describe('MetaMask Responsive UI', function () { await driver.press('#confirm-password', driver.Key.ENTER); // balance renders - await assertAccountBalanceForDOM(driver, ganacheServer); + await locateAccountBalanceDOM(driver, ganacheServer); }, ); }); diff --git a/test/e2e/tests/multiple-transactions.spec.js b/test/e2e/tests/multiple-transactions.spec.js index a4c9a505b91e..4bac6e54fff6 100644 --- a/test/e2e/tests/multiple-transactions.spec.js +++ b/test/e2e/tests/multiple-transactions.spec.js @@ -4,6 +4,7 @@ const { withFixtures, openDapp, regularDelayMs, + unlockWallet, } = require('../helpers'); const FixtureBuilder = require('../fixture-builder'); @@ -31,8 +32,7 @@ describe('Multiple transactions', function () { }, async ({ driver }) => { await driver.navigate(); - await driver.fill('#password', 'correct horse battery staple'); - await driver.press('#password', driver.Key.ENTER); + await unlockWallet(driver); // initiates a transaction from the dapp await openDapp(driver); @@ -62,7 +62,13 @@ describe('Multiple transactions', function () { tag: 'a', }); await driver.clickElement({ text: 'Confirm', tag: 'button' }); - await driver.waitForElementNotPresent('.loading-overlay__spinner'); + await driver.switchToWindow(confirmation); + + // wait for the "Reject 2 transactions" to disappear + await driver.waitForElementNotPresent( + '.page-container__footer-secondary a', + ); + // confirms first transaction await driver.clickElement({ text: 'Confirm', tag: 'button' }); @@ -95,8 +101,7 @@ describe('Multiple transactions', function () { }, async ({ driver }) => { await driver.navigate(); - await driver.fill('#password', 'correct horse battery staple'); - await driver.press('#password', driver.Key.ENTER); + await unlockWallet(driver); // initiates a transaction from the dapp await openDapp(driver); diff --git a/test/e2e/tests/onboarding.spec.js b/test/e2e/tests/onboarding.spec.js index eed6643eec4c..6c506104959f 100644 --- a/test/e2e/tests/onboarding.spec.js +++ b/test/e2e/tests/onboarding.spec.js @@ -9,7 +9,7 @@ const { importSRPOnboardingFlow, importWrongSRPOnboardingFlow, testSRPDropdownIterations, - assertAccountBalanceForDOM, + locateAccountBalanceDOM, defaultGanacheOptions, } = require('../helpers'); const FixtureBuilder = require('../fixture-builder'); @@ -296,7 +296,7 @@ describe('MetaMask onboarding @no-mmi', function () { text: networkName, }); - await assertAccountBalanceForDOM(driver, secondaryGanacheServer); + await locateAccountBalanceDOM(driver, secondaryGanacheServer); }, ); }); diff --git a/test/e2e/tests/send-eth.spec.js b/test/e2e/tests/send-eth.spec.js index 320102bc57e1..cf9f0bbdb912 100644 --- a/test/e2e/tests/send-eth.spec.js +++ b/test/e2e/tests/send-eth.spec.js @@ -4,7 +4,7 @@ const { convertToHexValue, withFixtures, openDapp, - assertAccountBalanceForDOM, + locateAccountBalanceDOM, logInWithBalanceValidation, } = require('../helpers'); const FixtureBuilder = require('../fixture-builder'); @@ -429,7 +429,7 @@ describe('Send ETH from inside MetaMask to a Multisig Address', function () { await driver.clickElement({ text: 'Confirm', tag: 'button' }); // Go back to home screen to check txn - await assertAccountBalanceForDOM(driver, ganacheServer); + await locateAccountBalanceDOM(driver, ganacheServer); await driver.clickElement('[data-testid="home__activity-tab"]'); const txn = await driver.isElementPresent( '.transaction-list__completed-transactions .activity-list-item', diff --git a/test/e2e/tests/send-hex-address.spec.js b/test/e2e/tests/send-hex-address.spec.js index cd656e9963e5..8b4851ce07b4 100644 --- a/test/e2e/tests/send-hex-address.spec.js +++ b/test/e2e/tests/send-hex-address.spec.js @@ -1,4 +1,3 @@ -const { strict: assert } = require('assert'); const { convertToHexValue, withFixtures, @@ -40,7 +39,7 @@ describe('Send ETH to a 40 character hexadecimal address', function () { 'input[placeholder="Enter public address (0x) or ENS name"]', nonHexPrefixedAddress, ); - await driver.waitForSelector({ + await driver.findElement({ css: '.ens-input__selected-input__title', text: hexPrefixedAddress, }); @@ -49,7 +48,7 @@ describe('Send ETH to a 40 character hexadecimal address', function () { // Confirm transaction await driver.clickElement({ text: 'Confirm', tag: 'button' }); await driver.clickElement('[data-testid="home__activity-tab"]'); - const sendTransactionListItem = await driver.waitForSelector( + const sendTransactionListItem = await driver.findElement( '.transaction-list__completed-transactions .activity-list-item', ); await sendTransactionListItem.click(); @@ -57,10 +56,10 @@ describe('Send ETH to a 40 character hexadecimal address', function () { await driver.clickElement('[data-testid="sender-to-recipient__name"]'); // Verify address in activity log - const publicAddress = await driver.findElement( - '.nickname-popover__public-address', - ); - assert.equal(await publicAddress.getText(), hexPrefixedAddress); + await driver.findElement({ + css: '.nickname-popover__public-address', + text: hexPrefixedAddress, + }); }, ); }); @@ -72,10 +71,9 @@ describe('Send ETH to a 40 character hexadecimal address', function () { title: this.test.title, failOnConsoleError: false, }, - async ({ driver }) => { + async ({ driver, ganacheServer }) => { await driver.navigate(); - await driver.fill('#password', 'correct horse battery staple'); - await driver.press('#password', driver.Key.ENTER); + await logInWithBalanceValidation(driver, ganacheServer); // Send ETH await driver.clickElement('[data-testid="eth-overview-send"]'); @@ -85,7 +83,7 @@ describe('Send ETH to a 40 character hexadecimal address', function () { 'input[placeholder="Enter public address (0x) or ENS name"]', nonHexPrefixedAddress, ); - await driver.waitForSelector({ + await driver.findElement({ css: '.ens-input__selected-input__title', text: hexPrefixedAddress, }); @@ -94,18 +92,17 @@ describe('Send ETH to a 40 character hexadecimal address', function () { // Confirm transaction await driver.clickElement({ text: 'Confirm', tag: 'button' }); await driver.clickElement('[data-testid="home__activity-tab"]'); - const sendTransactionListItem = await driver.waitForSelector( + await driver.clickElement( '.transaction-list__completed-transactions .activity-list-item', ); - await sendTransactionListItem.click(); await driver.clickElement({ text: 'Activity log', tag: 'summary' }); await driver.clickElement('[data-testid="sender-to-recipient__name"]'); // Verify address in activity log - const publicAddress = await driver.findElement( - '.nickname-popover__public-address', - ); - assert.equal(await publicAddress.getText(), hexPrefixedAddress); + await driver.findElement({ + css: '.nickname-popover__public-address', + text: hexPrefixedAddress, + }); }, ); }); @@ -148,27 +145,27 @@ describe('Send ERC20 to a 40 character hexadecimal address', function () { 'input[placeholder="Enter public address (0x) or ENS name"]', nonHexPrefixedAddress, ); - await driver.waitForSelector({ + await driver.findElement({ css: '.ens-input__selected-input__title', text: hexPrefixedAddress, }); - await driver.waitForSelector({ + await driver.findElement({ css: '.transaction-detail-item', text: '0.000042 ETH', }); await driver.clickElement({ text: 'Next', tag: 'button' }); // Confirm transaction - await driver.waitForSelector({ + await driver.findElement({ css: '.confirm-page-container-summary__title', text: '0', }); await driver.clickElement({ text: 'Confirm', tag: 'button' }); await driver.clickElement('[data-testid="home__activity-tab"]'); - await driver.waitForSelector( + await driver.findElement( '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)', ); - const sendTransactionListItem = await driver.waitForSelector( + const sendTransactionListItem = await driver.findElement( '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)', ); await sendTransactionListItem.click(); @@ -176,10 +173,10 @@ describe('Send ERC20 to a 40 character hexadecimal address', function () { await driver.clickElement('[data-testid="sender-to-recipient__name"]'); // Verify address in activity log - const publicAddress = await driver.findElement( - '.nickname-popover__public-address', - ); - assert.equal(await publicAddress.getText(), hexPrefixedAddress); + await driver.findElement({ + css: '.nickname-popover__public-address', + text: hexPrefixedAddress, + }); }, ); }); @@ -209,27 +206,27 @@ describe('Send ERC20 to a 40 character hexadecimal address', function () { 'input[placeholder="Enter public address (0x) or ENS name"]', nonHexPrefixedAddress, ); - await driver.waitForSelector({ + await driver.findElement({ css: '.ens-input__selected-input__title', text: hexPrefixedAddress, }); - await driver.waitForSelector({ + await driver.findElement({ css: '.transaction-detail-item', text: '0.000042 ETH', }); await driver.clickElement({ text: 'Next', tag: 'button' }); // Confirm transaction - await driver.waitForSelector({ + await driver.findElement({ css: '.confirm-page-container-summary__title', text: '0', }); await driver.clickElement({ text: 'Confirm', tag: 'button' }); await driver.clickElement('[data-testid="home__activity-tab"]'); - await driver.waitForSelector( + await driver.findElement( '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)', ); - const sendTransactionListItem = await driver.waitForSelector( + const sendTransactionListItem = await driver.findElement( '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)', ); await sendTransactionListItem.click(); @@ -237,10 +234,10 @@ describe('Send ERC20 to a 40 character hexadecimal address', function () { await driver.clickElement('[data-testid="sender-to-recipient__name"]'); // Verify address in activity log - const publicAddress = await driver.findElement( - '.nickname-popover__public-address', - ); - assert.equal(await publicAddress.getText(), hexPrefixedAddress); + await driver.findElement({ + css: '.nickname-popover__public-address', + text: hexPrefixedAddress, + }); }, ); }); From 487c079c9bce3f17f1ea74f829f9ee6cb1d31b22 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Mon, 9 Oct 2023 11:08:59 +0200 Subject: [PATCH 066/219] Improve snap export metrics throttling (#21230) ## **Description** The previous throttling on the snap export metrics was too aggressive and would skip out on a bunch of events for some snaps. This PR improves this by changing the throttling logic to be per snap and per export. ## **Manual testing steps** 1. Install two different snaps (one using RPC and one using insights) 2. Make multiple RPC requests to one of the snaps and see that it is throttled 3. Create a transaction and view the insights tab multiple times, verify that the event for that is throttled --- app/scripts/metamask-controller.js | 34 +++++++++++++++++++----------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index ed586e3bce49..f78a20124c26 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -9,6 +9,8 @@ import { debounce, ///: BEGIN:ONLY_INCLUDE_IN(snaps) throttle, + memoize, + wrap, ///: END:ONLY_INCLUDE_IN } from 'lodash'; import { keyringBuilderFactory } from '@metamask/eth-keyring-controller'; @@ -1973,22 +1975,30 @@ export default class MetamaskController extends EventEmitter { ///: BEGIN:ONLY_INCLUDE_IN(snaps) /** - * Tracks snaps export usage. Note: This function is throttled to 1 call per 60 seconds. + * Tracks snaps export usage. + * Note: This function is throttled to 1 call per 60 seconds per snap id + handler combination. * * @param {string} snapId - The ID of the snap the handler is being triggered on. * @param {string} handler - The handler to trigger on the snap for the request. */ - _trackSnapExportUsage = throttle( - (snapId, handler) => - this.metaMetricsController.trackEvent({ - event: MetaMetricsEventName.SnapExportUsed, - category: MetaMetricsEventCategory.Snaps, - properties: { - snap_id: snapId, - export: handler, - }, - }), - SECOND * 60, + _trackSnapExportUsage = wrap( + memoize( + () => + throttle( + (snapId, handler) => + this.metaMetricsController.trackEvent({ + event: MetaMetricsEventName.SnapExportUsed, + category: MetaMetricsEventCategory.Snaps, + properties: { + snap_id: snapId, + export: handler, + }, + }), + SECOND * 60, + ), + (snapId, handler) => `${snapId}${handler}`, + ), + (getFunc, ...args) => getFunc(...args)(...args), ); /** From 9b65d41728f242b3ef83f3ad5dd979fd1ab8f2ab Mon Sep 17 00:00:00 2001 From: Peter <53189696+PeterYinusa@users.noreply.github.com> Date: Mon, 9 Oct 2023 11:01:59 +0100 Subject: [PATCH 067/219] Block explorer e2e (#21235) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** _Write a short description of the changes included in this pull request, also include relevant motivation and context. Have in mind the following questions:_ _1. What is the reason for the change?_ _2. What is the improvement/solution?_ Fixes #21234 Add block explorer e2e tests - Account - Token - Transaction ## **Manual testing steps** _1. Step1:_ _2. Step2:_ _3. ..._ ## **Screenshots/Recordings** _If applicable, add screenshots and/or recordings to visualize the before and after of your change._ ### **Before** _[screenshot]_ ### **After** _[screenshot]_ ## **Related issues** _Fixes #???_ ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've clearly explained: - [ ] What problem this PR is solving. - [ ] How this problem was solved. - [ ] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- privacy-snapshot.json | 1 + test/e2e/fixture-builder.js | 1 + test/e2e/mock-e2e.js | 40 +++++++ test/e2e/tests/block-explorer.spec.js | 145 ++++++++++++++++++++++++++ 4 files changed, 187 insertions(+) create mode 100644 test/e2e/tests/block-explorer.spec.js diff --git a/privacy-snapshot.json b/privacy-snapshot.json index d0395058767a..bd6d6ae7a7b4 100644 --- a/privacy-snapshot.json +++ b/privacy-snapshot.json @@ -11,6 +11,7 @@ "configuration.metamask-institutional.io", "customnetwork.com", "doesntexist.abc", + "etherscan.io", "execution.consensys.io", "fonts.gstatic.com", "gas-api.metaswap.codefi.network", diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js index 7f59264e6e84..2146938654f0 100644 --- a/test/e2e/fixture-builder.js +++ b/test/e2e/fixture-builder.js @@ -1372,6 +1372,7 @@ class FixtureBuilder { type: '0x2', value: '0xde0b6b3a7640000', }, + hash: '0xe5e7b95690f584b8f66b33e31acc6184fea553fa6722d42486a59990d13d5fa2', txReceipt: { blockNumber: { length: 1, diff --git a/test/e2e/mock-e2e.js b/test/e2e/mock-e2e.js index 4d932ebdf1f0..ade050b640f7 100644 --- a/test/e2e/mock-e2e.js +++ b/test/e2e/mock-e2e.js @@ -8,6 +8,17 @@ const { mockEmptyStalelistAndHotlist, } = require('./tests/phishing-controller/mocks'); +const emptyHtmlPage = () => ` + + + + E2E Test Page + + + Empty page by MetaMask + +`; + /** * The browser makes requests to domains within its own namespace for * functionality specific to the browser. For example when running E2E tests in @@ -56,6 +67,35 @@ async function setupMocking(server, testSpecificMock, { chainId }) { // Mocks below this line can be overridden by test-specific mocks + // Account link + const accountLinkRegex = + /^https:\/\/etherscan.io\/address\/0x[a-fA-F0-9]{40}$/u; + await server.forGet(accountLinkRegex).thenCallback(() => { + return { + statusCode: 200, + body: emptyHtmlPage(), + }; + }); + + // Token tracker link + const tokenTrackerRegex = + /^https:\/\/etherscan.io\/token\/0x[a-fA-F0-9]{40}$/u; + await server.forGet(tokenTrackerRegex).thenCallback(() => { + return { + statusCode: 200, + body: emptyHtmlPage(), + }; + }); + + // Explorer link + const explorerLinkRegex = /^https:\/\/etherscan.io\/tx\/0x[a-fA-F0-9]{64}$/u; + await server.forGet(explorerLinkRegex).thenCallback(() => { + return { + statusCode: 200, + body: emptyHtmlPage(), + }; + }); + await server .forPost( 'https://arbitrum-mainnet.infura.io/v3/00000000000000000000000000000000', diff --git a/test/e2e/tests/block-explorer.spec.js b/test/e2e/tests/block-explorer.spec.js new file mode 100644 index 000000000000..4627d4df5322 --- /dev/null +++ b/test/e2e/tests/block-explorer.spec.js @@ -0,0 +1,145 @@ +const { strict: assert } = require('assert'); +const { defaultGanacheOptions, withFixtures } = require('../helpers'); +const { SMART_CONTRACTS } = require('../seeder/smart-contracts'); +const FixtureBuilder = require('../fixture-builder'); + +describe('Block Explorer', function () { + it('links to the users account on the explorer, ', async function () { + await withFixtures( + { + fixtures: new FixtureBuilder() + .withNetworkController({ + providerConfig: { + rpcPrefs: { blockExplorerUrl: 'https://etherscan.io/' }, + }, + }) + .build(), + ganacheOptions: defaultGanacheOptions, + title: this.test.title, + }, + async ({ driver }) => { + await driver.navigate(); + await driver.fill('#password', 'correct horse battery staple'); + await driver.press('#password', driver.Key.ENTER); + + // View account on explorer + await driver.clickElement('[data-testid="account-menu-icon"]'); + await driver.clickElement( + '[data-testid="account-list-item-menu-button"]', + ); + await driver.clickElement({ text: 'View on explorer', tag: 'p' }); + + // Switch to block explorer + await driver.waitUntilXWindowHandles(2); + const windowHandles = await driver.getAllWindowHandles(); + await driver.switchToWindowWithTitle('E2E Test Page', windowHandles); + const body = await driver.findElement( + '[data-testid="empty-page-body"]', + ); + + // Verify block explorer + assert.equal(await body.getText(), 'Empty page by MetaMask'); + assert.equal( + await driver.getCurrentUrl(), + 'https://etherscan.io/address/0x5CfE73b6021E818B776b421B1c4Db2474086a7e1', + ); + }, + ); + }); + + it('links to the token tracker in the explorer, ', async function () { + await withFixtures( + { + dapp: true, + fixtures: new FixtureBuilder() + .withNetworkController({ + providerConfig: { + rpcPrefs: { blockExplorerUrl: 'https://etherscan.io/' }, + }, + }) + .withTokensControllerERC20() + .build(), + ganacheOptions: defaultGanacheOptions, + smartContract: SMART_CONTRACTS.HST, + title: this.test.title, + }, + async ({ driver }) => { + await driver.navigate(); + await driver.fill('#password', 'correct horse battery staple'); + await driver.press('#password', driver.Key.ENTER); + + // View TST token in block explorer + await driver.clickElement('[data-testid="home__asset-tab"]'); + const [, tst] = await driver.findElements( + '[data-testid="multichain-token-list-button"]', + ); + await tst.click(); + await driver.clickElement('[data-testid="asset-options__button"]'); + await driver.clickElement({ + text: 'View Asset in explorer', + tag: 'div', + }); + + // Switch to block explorer + await driver.waitUntilXWindowHandles(2); + const windowHandles = await driver.getAllWindowHandles(); + await driver.switchToWindowWithTitle('E2E Test Page', windowHandles); + const body = await driver.findElement( + '[data-testid="empty-page-body"]', + ); + + // Verify block explorer + assert.equal(await body.getText(), 'Empty page by MetaMask'); + assert.equal( + await driver.getCurrentUrl(), + 'https://etherscan.io/token/0x581c3C1A2A4EBDE2A0Df29B5cf4c116E42945947', + ); + }, + ); + }); + + it('links to the transaction on the explorer, ', async function () { + await withFixtures( + { + fixtures: new FixtureBuilder() + .withNetworkController({ + providerConfig: { + rpcPrefs: { blockExplorerUrl: 'https://etherscan.io/' }, + }, + }) + .withTransactionControllerCompletedTransaction() + .build(), + ganacheOptions: defaultGanacheOptions, + title: this.test.title, + }, + async ({ driver }) => { + await driver.navigate(); + await driver.fill('#password', 'correct horse battery staple'); + await driver.press('#password', driver.Key.ENTER); + + // View transaction on block explorer + await driver.clickElement('[data-testid="home__activity-tab"]'); + await driver.clickElement('[data-testid="activity-list-item-action"]'); + await driver.clickElement({ + text: 'View on block explorer', + tag: 'a', + }); + + // Switch to block explorer + await driver.waitUntilXWindowHandles(2); + const windowHandles = await driver.getAllWindowHandles(); + await driver.switchToWindowWithTitle('E2E Test Page', windowHandles); + const body = await driver.findElement( + '[data-testid="empty-page-body"]', + ); + + // Verify block explorer + assert.equal(await body.getText(), 'Empty page by MetaMask'); + assert.equal( + await driver.getCurrentUrl(), + 'https://etherscan.io/tx/0xe5e7b95690f584b8f66b33e31acc6184fea553fa6722d42486a59990d13d5fa2', + ); + }, + ); + }); +}); From 5ca6dee06d70c59ea47e798479538b21760a85d2 Mon Sep 17 00:00:00 2001 From: Jyoti Puri Date: Mon, 9 Oct 2023 15:32:23 +0530 Subject: [PATCH 068/219] Change in experimental settings designs for enabling blockaid and opensea (#21074) --- app/_locales/de/messages.json | 10 - app/_locales/el/messages.json | 10 - app/_locales/en/messages.json | 22 +- app/_locales/es/messages.json | 10 - app/_locales/fr/messages.json | 10 - app/_locales/hi/messages.json | 10 - app/_locales/id/messages.json | 10 - app/_locales/ja/messages.json | 10 - app/_locales/ko/messages.json | 10 - app/_locales/pt/messages.json | 10 - app/_locales/ru/messages.json | 10 - app/_locales/tl/messages.json | 10 - app/_locales/tr/messages.json | 10 - app/_locales/vi/messages.json | 10 - app/_locales/zh_CN/messages.json | 10 - .../experimental-tab.test.js.snap | 117 +++++----- .../experimental-tab.component.js | 200 ++++++++---------- 17 files changed, 165 insertions(+), 314 deletions(-) diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index 24afbd375a2d..55a032bc74c8 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -3022,9 +3022,6 @@ "openInBlockExplorer": { "message": "Im Block-Explorer öffnen" }, - "openSea": { - "message": "OpenSea (Beta)" - }, "openSeaNew": { "message": "OpenSea" }, @@ -4799,9 +4796,6 @@ "termsOfService": { "message": "Nutzungsbedingungen" }, - "termsOfUse": { - "message": "Nutzungsbedingungen" - }, "termsOfUseAgreeText": { "message": " Ich akzeptiere die Nutzungsbedingungen, die meine Verwendung von MetaMask, einschließlich aller seiner Funktionen, betreffen" }, @@ -4830,10 +4824,6 @@ "thisCollection": { "message": "diese Sammlung" }, - "thisServiceIsExperimental": { - "message": "Dieser Dienst ist experimentell. Durch die Aktivierung dieser Funktion stimmen Sie den $1 von OpenSea zu.", - "description": "$1 is link to open sea terms of use" - }, "time": { "message": "Zeit" }, diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index 08678e0aa55f..5389e75ff1b8 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -3022,9 +3022,6 @@ "openInBlockExplorer": { "message": "Άνοιγμα στο Block Explorer" }, - "openSea": { - "message": "OpenSea + Blockaid (Δοκιμαστικά)" - }, "openSeaNew": { "message": "OpenSea" }, @@ -4799,9 +4796,6 @@ "termsOfService": { "message": "Όροι παροχής υπηρεσιών" }, - "termsOfUse": { - "message": "όροι χρήσης" - }, "termsOfUseAgreeText": { "message": " Συμφωνώ με τους Όρους Χρήσης, οι οποίοι ισχύουν για τη χρήση του MetaMask και όλων των λειτουργιών του" }, @@ -4830,10 +4824,6 @@ "thisCollection": { "message": "αυτή η συλλογή" }, - "thisServiceIsExperimental": { - "message": "Η υπηρεσία αυτή είναι πειραματική. Ενεργοποιώντας αυτή τη λειτουργία, συμφωνείτε με τους $1 του OpenSea.", - "description": "$1 is link to open sea terms of use" - }, "time": { "message": "Ώρα" }, diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index d7fc206ef926..2218a1f51446 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -599,6 +599,9 @@ "blockaidDescriptionTransferFarming": { "message": "If you approve this request, a third party known for scams will take all your assets." }, + "blockaidMessage": { + "message": "Privacy preserving - no data is shared with third parties. Available on Ethereum Mainnet." + }, "blockaidTitleDeceptive": { "message": "This is a deceptive request" }, @@ -3195,8 +3198,11 @@ "openInBlockExplorer": { "message": "Open in block explorer" }, - "openSea": { - "message": "OpenSea + Blockaid (Beta)" + "openSeaLabel": { + "message": "OpenSea + Blockaid" + }, + "openSeaMessage": { + "message": "Data is shared with third parties. Security providers will receive your unsigned transactions and signature requests." }, "openSeaNew": { "message": "OpenSea" @@ -3500,6 +3506,9 @@ "message": "Preferred Ledger connection type", "description": "A header for a dropdown in Settings > Advanced. Appears above the ledgerConnectionPreferenceDescription message" }, + "preferredProvider": { + "message": "Select your preferred provider" + }, "preparingSwap": { "message": "Preparing swap..." }, @@ -3849,7 +3858,7 @@ "message": "Security alerts" }, "securityAlertsDescription": { - "message": "This feature alerts you to malicious activity on Ethereum Mainnet by actively reviewing transaction and signature requests while preserving your privacy. Your data isn't shared with the third party providing this service. Always do your own due diligence before approving any requests. There's no guarantee that this feature will detect all malicious activity." + "message": "This feature alerts you to malicious activity by actively reviewing transaction and signature requests. Always do your own due diligence before approving any requests. There's no guarantee that this feature will detect all malicious activity." }, "securityAndPrivacy": { "message": "Security & privacy" @@ -5044,9 +5053,6 @@ "termsOfService": { "message": "Terms of service" }, - "termsOfUse": { - "message": "terms of use" - }, "termsOfUseAgreeText": { "message": " I agree to the Terms of Use, which apply to my use of MetaMask and all of its features" }, @@ -5075,10 +5081,6 @@ "thisCollection": { "message": "this collection" }, - "thisServiceIsExperimental": { - "message": "This service is experimental. By enabling this feature, you agree to OpenSea's $1.", - "description": "$1 is link to open sea terms of use" - }, "time": { "message": "Time" }, diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 34093490fbfa..02e52fb7986d 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -3022,9 +3022,6 @@ "openInBlockExplorer": { "message": "Abrir en el explorador de bloques" }, - "openSea": { - "message": "OpenSea + Blockaid (Beta)" - }, "openSeaNew": { "message": "OpenSea" }, @@ -4799,9 +4796,6 @@ "termsOfService": { "message": "Términos de servicio" }, - "termsOfUse": { - "message": "términos de uso" - }, "termsOfUseAgreeText": { "message": " Acepto los Términos de uso, que se aplican al uso que hago de MetaMask y de todas sus funcionalidades" }, @@ -4830,10 +4824,6 @@ "thisCollection": { "message": "esta colección" }, - "thisServiceIsExperimental": { - "message": "Este servicio es experimental. Al habilitar esta función, usted acepta los $1 de OpenSea.", - "description": "$1 is link to open sea terms of use" - }, "time": { "message": "Tiempo" }, diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index bd08715878a9..125267970c51 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -3022,9 +3022,6 @@ "openInBlockExplorer": { "message": "Ouvrir dans l’explorateur de blocs" }, - "openSea": { - "message": "OpenSea + Blockaid (Beta)" - }, "openSeaNew": { "message": "OpenSea" }, @@ -4799,9 +4796,6 @@ "termsOfService": { "message": "Conditions de service" }, - "termsOfUse": { - "message": "conditions d’utilisation" - }, "termsOfUseAgreeText": { "message": " J’accepte les conditions d’utilisation de MetaMask et de ses fonctionnalités" }, @@ -4830,10 +4824,6 @@ "thisCollection": { "message": "cette collection" }, - "thisServiceIsExperimental": { - "message": "Ce service est expérimental. En activant cette fonctionnalité, vous acceptez les $1 d’OpenSea.", - "description": "$1 is link to open sea terms of use" - }, "time": { "message": "Temps" }, diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index f6e1e780c8d9..acc281a13a2f 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -3022,9 +3022,6 @@ "openInBlockExplorer": { "message": "ब्लॉक एक्सप्लोरर में खोलें" }, - "openSea": { - "message": "OpenSea + Blockaid (बीटा)" - }, "openSeaNew": { "message": "ओपनसी" }, @@ -4799,9 +4796,6 @@ "termsOfService": { "message": "सेवा की शर्तें" }, - "termsOfUse": { - "message": "इस्तेमाल की शर्तें" - }, "termsOfUseAgreeText": { "message": " मैं इस्तेमाल की शर्तों से सहमत हूं, जो MetaMask और इसकी सभी फीचर्स के मेरे इस्तेमाल पर लागू होती हैं" }, @@ -4830,10 +4824,6 @@ "thisCollection": { "message": "यह संग्रह" }, - "thisServiceIsExperimental": { - "message": "यह सेवा प्रायोगिक है। इस सुविधा को इनेबल करके, आप OpenSea के $1 से सहमत होते हैं।", - "description": "$1 is link to open sea terms of use" - }, "time": { "message": "समय" }, diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index 81a3ea3b51d9..f6a8a48116e3 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -3022,9 +3022,6 @@ "openInBlockExplorer": { "message": "Buka di block explorer" }, - "openSea": { - "message": "OpenSea + Blockaid (Beta)" - }, "openSeaNew": { "message": "OpenSea" }, @@ -4799,9 +4796,6 @@ "termsOfService": { "message": "Ketentuan layanan" }, - "termsOfUse": { - "message": "ketentuan penggunaan" - }, "termsOfUseAgreeText": { "message": " Saya menyetujui Syarat Penggunaan, yang berlaku untuk penggunaan atas MetaMask dan semua fiturnya" }, @@ -4830,10 +4824,6 @@ "thisCollection": { "message": "koleksi ini" }, - "thisServiceIsExperimental": { - "message": "Layanan ini bersifat eksperimental. Dengan mengaktifkan fitur ini, Anda menyetujui $1 OpenSea.", - "description": "$1 is link to open sea terms of use" - }, "time": { "message": "Waktu" }, diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index 6d24c1179a3b..ae8c1f77c5e7 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -3022,9 +3022,6 @@ "openInBlockExplorer": { "message": "ブロックエクスプローラーで開く" }, - "openSea": { - "message": "OpenSea + Blockaid (ベータ)" - }, "openSeaNew": { "message": "OpenSea" }, @@ -4799,9 +4796,6 @@ "termsOfService": { "message": "サービス規約" }, - "termsOfUse": { - "message": "利用規約" - }, "termsOfUseAgreeText": { "message": " MetaMaskおよびそのすべての機能の利用に適用される利用規約に同意します。" }, @@ -4830,10 +4824,6 @@ "thisCollection": { "message": "このコレクション" }, - "thisServiceIsExperimental": { - "message": "このサービスは試験運用中です。この機能を有効にすることで、OpenSeaの$1に同意したものとみなされます。", - "description": "$1 is link to open sea terms of use" - }, "time": { "message": "時間" }, diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index bfa48db76956..5b2561413742 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -3022,9 +3022,6 @@ "openInBlockExplorer": { "message": "블록 탐색기 열기" }, - "openSea": { - "message": "OpenSea+ Blockaid(베타)" - }, "openSeaNew": { "message": "OpenSea" }, @@ -4799,9 +4796,6 @@ "termsOfService": { "message": "서비스 약관" }, - "termsOfUse": { - "message": "이용약관" - }, "termsOfUseAgreeText": { "message": " 본인은 MetaMask의 사용 및 관련 모든 기능에 적용되는 이용약관에 동의합니다" }, @@ -4830,10 +4824,6 @@ "thisCollection": { "message": "이 컬렉션" }, - "thisServiceIsExperimental": { - "message": "이 서비스는 시험 기능입니다. 이 기능을 활성화하면 OpenSea의 $1에 동의하는 것입니다.", - "description": "$1 is link to open sea terms of use" - }, "time": { "message": "시간" }, diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index 257855b52ab8..a32ca5798450 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -3022,9 +3022,6 @@ "openInBlockExplorer": { "message": "Abrir no explorador de blocos" }, - "openSea": { - "message": "OpenSea + Blockaid (Beta)" - }, "openSeaNew": { "message": "OpenSea" }, @@ -4799,9 +4796,6 @@ "termsOfService": { "message": "Termos de Serviço" }, - "termsOfUse": { - "message": "termos de uso" - }, "termsOfUseAgreeText": { "message": " Eu concordo com os Termos de Uso, que se aplicam ao meu uso da MetaMask e de todos os seus recursos" }, @@ -4830,10 +4824,6 @@ "thisCollection": { "message": "esta coleção" }, - "thisServiceIsExperimental": { - "message": "Esse serviço é experimental. Ao ativar esse recurso, você concorda com os $1 da OpenSea.", - "description": "$1 is link to open sea terms of use" - }, "time": { "message": "Hora" }, diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index 53880c65e88e..19ae6e28218f 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -3022,9 +3022,6 @@ "openInBlockExplorer": { "message": "Открыть в обозревателе блоков" }, - "openSea": { - "message": "OpenSea + Blockaid (бета-версия)" - }, "openSeaNew": { "message": "OpenSea" }, @@ -4799,9 +4796,6 @@ "termsOfService": { "message": "Условия обслуживания" }, - "termsOfUse": { - "message": "условия использования" - }, "termsOfUseAgreeText": { "message": " Я согласен(-на) с Условиями использования, которые применяются к использованию мною MetaMask и всех его функций" }, @@ -4830,10 +4824,6 @@ "thisCollection": { "message": "эта коллекция" }, - "thisServiceIsExperimental": { - "message": "Эта услуга является экспериментальной. Включив эту функцию, вы соглашаетесь с $1 OpenSea.", - "description": "$1 is link to open sea terms of use" - }, "time": { "message": "Время" }, diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json index 22d24a3b9fe2..29b68022119a 100644 --- a/app/_locales/tl/messages.json +++ b/app/_locales/tl/messages.json @@ -3022,9 +3022,6 @@ "openInBlockExplorer": { "message": "Buksan sa block explorer" }, - "openSea": { - "message": "OpenSea + Blockaid (Beta)" - }, "openSeaNew": { "message": "OpenSea" }, @@ -4799,9 +4796,6 @@ "termsOfService": { "message": "Mga Tuntunin ng Serbisyo" }, - "termsOfUse": { - "message": "mga tuntunin ng paggamit" - }, "termsOfUseAgreeText": { "message": " Sumasang-ayon ako sa Mga Tuntunin sa Paggamit, na nalalapat sa aking paggamit ng MetaMask at lahat ng feature nito" }, @@ -4830,10 +4824,6 @@ "thisCollection": { "message": "koleksyong ito" }, - "thisServiceIsExperimental": { - "message": "Ang serbisyong ito ay pang-eksperimento. Sa pamamagitan ng pagpapagana ng feature na ito, sumasang-ayon ka sa $1 ng OpenSea.", - "description": "$1 is link to open sea terms of use" - }, "time": { "message": "Oras" }, diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index 7d4d98590169..555774ac6cb2 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -3022,9 +3022,6 @@ "openInBlockExplorer": { "message": "Blok gezgininde aç" }, - "openSea": { - "message": "OpenSea + Blockad (Beta)" - }, "openSeaNew": { "message": "OpenSea" }, @@ -4799,9 +4796,6 @@ "termsOfService": { "message": "Hizmet şartları" }, - "termsOfUse": { - "message": "kullanım şartları" - }, "termsOfUseAgreeText": { "message": " MetaMask ve tüm özelliklerini kullanımım için geçerli olan Kullanım Şartları bölümünü kabul ediyorum" }, @@ -4830,10 +4824,6 @@ "thisCollection": { "message": "bu koleksiyon" }, - "thisServiceIsExperimental": { - "message": "Hizmet deneyseldir. Bu özelliği etkinleştirerek OpenSea'nin $1 bölümünü kabul edersiniz.", - "description": "$1 is link to open sea terms of use" - }, "time": { "message": "Zaman" }, diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index 7ed25c06b926..286961aa9a25 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -3022,9 +3022,6 @@ "openInBlockExplorer": { "message": "Mở trên trình khám phá khối" }, - "openSea": { - "message": "OpenSea + Blockaid (Beta)" - }, "openSeaNew": { "message": "OpenSea" }, @@ -4799,9 +4796,6 @@ "termsOfService": { "message": "Điều khoản dịch vụ" }, - "termsOfUse": { - "message": "điều khoản sử dụng" - }, "termsOfUseAgreeText": { "message": " Tôi đồng ý với Điều khoản sử dụng được áp dụng cho việc tôi sử dụng MetaMask và tất cả các tính năng của MetaMask" }, @@ -4830,10 +4824,6 @@ "thisCollection": { "message": "bộ sưu tập này" }, - "thisServiceIsExperimental": { - "message": "Đây là dịch vụ thử nghiệm. Bằng cách bật tính năng này, bạn đồng ý với $1 của OpenSea.", - "description": "$1 is link to open sea terms of use" - }, "time": { "message": "Thời gian" }, diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index b0a60bec3dad..e70f019379ee 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -3022,9 +3022,6 @@ "openInBlockExplorer": { "message": "在区块浏览器上打开" }, - "openSea": { - "message": "OpenSea + Blockaid（测试版）" - }, "openSeaNew": { "message": "OpenSea" }, @@ -4799,9 +4796,6 @@ "termsOfService": { "message": "服务条款" }, - "termsOfUse": { - "message": "使用条款" - }, "termsOfUseAgreeText": { "message": "我同意适用于我使用MetaMask及其所有功能的使用条款" }, @@ -4830,10 +4824,6 @@ "thisCollection": { "message": "这个收藏品" }, - "thisServiceIsExperimental": { - "message": "此服务是实验性的。启用此功能，即表示您同意OpenSea的$1。", - "description": "$1 is link to open sea terms of use" - }, "time": { "message": "时间" }, diff --git a/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap b/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap index 01973aba260a..32b6cbac4c9e 100644 --- a/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap +++ b/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap @@ -16,26 +16,53 @@ exports[`ExperimentalTab with desktop enabled renders ExperimentalTab component
- +

Security alerts - +

- This feature alerts you to malicious activity on Ethereum Mainnet by actively reviewing transaction and signature requests while preserving your privacy. Your data isn't shared with the third party providing this service. Always do your own due diligence before approving any requests. There's no guarantee that this feature will detect all malicious activity. + This feature alerts you to malicious activity by actively reviewing transaction and signature requests. Always do your own due diligence before approving any requests. There's no guarantee that this feature will detect all malicious activity. +

+

+ Select your preferred provider

-

- Blockaid -

+
+
+

+ Blockaid +

+
+

+ Recommended +

+
+
+
+ Privacy preserving - no data is shared with third parties. Available on Ethereum Mainnet. +
+
-
-
-
-

- Privacy -

-
-
- - Enable security alerts - -
-
- We use third-party APIs to detect and display risks involved in unsigned transaction and signature requests before you sign them. These services will have access to your unsigned transaction and signature requests, your account address, and your preferred language. -
-
- OpenSea + Blockaid (Beta) -
+
+
+

+ OpenSea + Blockaid +

+
+

+ Beta +

+
+
+
+ Data is shared with third parties. Security providers will receive your unsigned transactions and signature requests. +
+
-
- - - This service is experimental. By enabling this feature, you agree to OpenSea's - - terms of use - - . - - -
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.component.js b/ui/pages/settings/experimental-tab/experimental-tab.component.js index e89a90231757..d6a0c95a42d1 100644 --- a/ui/pages/settings/experimental-tab/experimental-tab.component.js +++ b/ui/pages/settings/experimental-tab/experimental-tab.component.js @@ -12,14 +12,16 @@ import { ///: END:ONLY_INCLUDE_IN } from '../../../../shared/constants/metametrics'; -import { Text, Box } from '../../../components/component-library'; +import { Text, Box, Tag } from '../../../components/component-library'; import { TextColor, TextVariant, + Display, + ///: BEGIN:ONLY_INCLUDE_IN(blockaid,desktop) FontWeight, + ///: END:ONLY_INCLUDE_IN ///: BEGIN:ONLY_INCLUDE_IN(desktop) AlignItems, - Display, FlexDirection, FlexWrap, JustifyContent, @@ -69,71 +71,14 @@ export default class ExperimentalTab extends PureComponent { handleSettingsRefs(t, t('experimental'), this.settingsRefs); } - ///: BEGIN:ONLY_INCLUDE_IN(blockaid) renderSecurityAlertsToggle() { const { t } = this.context; - const { securityAlertsEnabled, setSecurityAlertsEnabled } = this.props; - - return ( - <> - - {t('security')} - -
-
- {t('securityAlerts')} -
- - {t('securityAlertsDescription')} - -
- - {t('blockaid')} - - { - this.context.trackEvent({ - category: MetaMetricsEventCategory.Settings, - event: 'Enabled/Disable security_alerts_enabled', - properties: { - action: 'Enabled/Disable security_alerts_enabled', - legacy_event: true, - }, - }); - setSecurityAlertsEnabled(!value || false); - }} - /> -
-
-
-
- - ); - } - ///: END:ONLY_INCLUDE_IN - - renderTransactionSecurityCheckToggle() { - const { t } = this.context; - const { + ///: BEGIN:ONLY_INCLUDE_IN(blockaid) + securityAlertsEnabled, + setSecurityAlertsEnabled, + ///: END:ONLY_INCLUDE_IN transactionSecurityCheckEnabled, setTransactionSecurityCheckEnabled, } = this.props; @@ -142,38 +87,99 @@ export default class ExperimentalTab extends PureComponent { <> - {t('privacy')} + {t('security')} -
- {t('transactionSecurityCheck')} + + {t('securityAlerts')} +
- +
); } @@ -324,12 +313,7 @@ export default class ExperimentalTab extends PureComponent { render() { return (
- { - ///: BEGIN:ONLY_INCLUDE_IN(blockaid) - this.renderSecurityAlertsToggle() - ///: END:ONLY_INCLUDE_IN - } - {this.renderTransactionSecurityCheckToggle()} + {this.renderSecurityAlertsToggle()} { ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) this.renderKeyringSnapsToggle() From 5236e02c5e96678d64219455c96ede990206c365 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Mon, 9 Oct 2023 12:48:57 +0200 Subject: [PATCH 069/219] Remove usage of `subject-metadata-controller` package (#21254) ## **Description** The `SubjectMetadataController` and its utilities were moved to the `permission-controller` package a while back (https://github.com/MetaMask/core/pull/1234). This PR removes usage of the old deprecated package in favor of `permission-controller`. There should be no functionality changes by this change. --- app/scripts/metamask-controller.js | 4 +- app/scripts/migrations/069.js | 2 +- app/scripts/migrations/069.test.js | 2 +- lavamoat/browserify/beta/policy.json | 10 ---- lavamoat/browserify/desktop/policy.json | 10 ---- lavamoat/browserify/flask/policy.json | 10 ---- lavamoat/browserify/main/policy.json | 10 ---- lavamoat/browserify/mmi/policy.json | 10 ---- package.json | 1 - .../permissions-connect-header.component.js | 2 +- ui/hooks/useOriginMetadata.js | 2 +- .../permissions-connect.component.js | 2 +- .../permissions-connect.container.js | 2 +- ui/selectors/selectors.js | 2 +- yarn.lock | 58 ------------------- 15 files changed, 8 insertions(+), 119 deletions(-) diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index f78a20124c26..94d12f3de2d1 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -49,11 +49,9 @@ import { GasFeeController } from '@metamask/gas-fee-controller'; import { PermissionController, PermissionsRequestNotFoundError, -} from '@metamask/permission-controller'; -import { SubjectMetadataController, SubjectType, -} from '@metamask/subject-metadata-controller'; +} from '@metamask/permission-controller'; import SmartTransactionsController from '@metamask/smart-transactions-controller'; import { SelectedNetworkController, diff --git a/app/scripts/migrations/069.js b/app/scripts/migrations/069.js index 2f07770e9665..00b0385e4366 100644 --- a/app/scripts/migrations/069.js +++ b/app/scripts/migrations/069.js @@ -1,4 +1,4 @@ -import { SubjectType } from '@metamask/subject-metadata-controller'; +import { SubjectType } from '@metamask/permission-controller'; import { cloneDeep } from 'lodash'; const version = 69; diff --git a/app/scripts/migrations/069.test.js b/app/scripts/migrations/069.test.js index 84200a08f5c1..f737154af8a8 100644 --- a/app/scripts/migrations/069.test.js +++ b/app/scripts/migrations/069.test.js @@ -1,4 +1,4 @@ -import { SubjectType } from '@metamask/subject-metadata-controller'; +import { SubjectType } from '@metamask/permission-controller'; import migration69 from './069'; describe('migration #69', () => { diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index 1d5bc4c9562c..da7437131ab9 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -2169,16 +2169,6 @@ "semver": true } }, - "@metamask/subject-metadata-controller": { - "packages": { - "@metamask/subject-metadata-controller>@metamask/base-controller": true - } - }, - "@metamask/subject-metadata-controller>@metamask/base-controller": { - "packages": { - "immer": true - } - }, "@metamask/utils": { "globals": { "TextDecoder": true, diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json index c778599726dd..0f9d838025b1 100644 --- a/lavamoat/browserify/desktop/policy.json +++ b/lavamoat/browserify/desktop/policy.json @@ -2571,16 +2571,6 @@ "semver": true } }, - "@metamask/subject-metadata-controller": { - "packages": { - "@metamask/subject-metadata-controller>@metamask/base-controller": true - } - }, - "@metamask/subject-metadata-controller>@metamask/base-controller": { - "packages": { - "immer": true - } - }, "@metamask/utils": { "globals": { "TextDecoder": true, diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 259005fc3545..8fb9de1d7c20 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -2587,16 +2587,6 @@ "semver": true } }, - "@metamask/subject-metadata-controller": { - "packages": { - "@metamask/subject-metadata-controller>@metamask/base-controller": true - } - }, - "@metamask/subject-metadata-controller>@metamask/base-controller": { - "packages": { - "immer": true - } - }, "@metamask/utils": { "globals": { "TextDecoder": true, diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 98db5e952b64..28e8a7593919 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -2430,16 +2430,6 @@ "semver": true } }, - "@metamask/subject-metadata-controller": { - "packages": { - "@metamask/subject-metadata-controller>@metamask/base-controller": true - } - }, - "@metamask/subject-metadata-controller>@metamask/base-controller": { - "packages": { - "immer": true - } - }, "@metamask/utils": { "globals": { "TextDecoder": true, diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index 5881b79a589f..76a4437d69f6 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -2570,16 +2570,6 @@ "semver": true } }, - "@metamask/subject-metadata-controller": { - "packages": { - "@metamask/subject-metadata-controller>@metamask/base-controller": true - } - }, - "@metamask/subject-metadata-controller>@metamask/base-controller": { - "packages": { - "immer": true - } - }, "@metamask/utils": { "globals": { "TextDecoder": true, diff --git a/package.json b/package.json index ac80aa6d31ce..5a3782722d94 100644 --- a/package.json +++ b/package.json @@ -281,7 +281,6 @@ "@metamask/snaps-controllers": "^2.0.2", "@metamask/snaps-ui": "^2.0.0", "@metamask/snaps-utils": "^2.0.1", - "@metamask/subject-metadata-controller": "^2.0.0", "@metamask/utils": "^5.0.0", "@ngraveio/bc-ur": "^1.1.6", "@popperjs/core": "^2.4.0", diff --git a/ui/components/app/permissions-connect-header/permissions-connect-header.component.js b/ui/components/app/permissions-connect-header/permissions-connect-header.component.js index 725db0fc4e78..fcbccf1d1f87 100644 --- a/ui/components/app/permissions-connect-header/permissions-connect-header.component.js +++ b/ui/components/app/permissions-connect-header/permissions-connect-header.component.js @@ -2,7 +2,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import classnames from 'classnames'; ///: BEGIN:ONLY_INCLUDE_IN(snaps) -import { SubjectType } from '@metamask/subject-metadata-controller'; +import { SubjectType } from '@metamask/permission-controller'; ///: END:ONLY_INCLUDE_IN import SiteOrigin from '../../ui/site-origin'; import Box from '../../ui/box'; diff --git a/ui/hooks/useOriginMetadata.js b/ui/hooks/useOriginMetadata.js index fe1eaef104a1..c7887c20758e 100644 --- a/ui/hooks/useOriginMetadata.js +++ b/ui/hooks/useOriginMetadata.js @@ -1,4 +1,4 @@ -import { SubjectType } from '@metamask/subject-metadata-controller'; +import { SubjectType } from '@metamask/permission-controller'; import { useSelector } from 'react-redux'; import { getTargetSubjectMetadata } from '../selectors'; diff --git a/ui/pages/permissions-connect/permissions-connect.component.js b/ui/pages/permissions-connect/permissions-connect.component.js index 4820bc1ab55a..276f64c3accf 100644 --- a/ui/pages/permissions-connect/permissions-connect.component.js +++ b/ui/pages/permissions-connect/permissions-connect.component.js @@ -3,7 +3,7 @@ import React, { Component } from 'react'; import { Switch, Route } from 'react-router-dom'; ///: BEGIN:ONLY_INCLUDE_IN(snaps) import { ethErrors, serializeError } from 'eth-rpc-errors'; -import { SubjectType } from '@metamask/subject-metadata-controller'; +import { SubjectType } from '@metamask/permission-controller'; ///: END:ONLY_INCLUDE_IN import { getEnvironmentType } from '../../../app/scripts/lib/util'; import { ENVIRONMENT_TYPE_NOTIFICATION } from '../../../shared/constants/app'; diff --git a/ui/pages/permissions-connect/permissions-connect.container.js b/ui/pages/permissions-connect/permissions-connect.container.js index a5f1ee145092..f9054410e1d6 100644 --- a/ui/pages/permissions-connect/permissions-connect.container.js +++ b/ui/pages/permissions-connect/permissions-connect.container.js @@ -1,4 +1,4 @@ -import { SubjectType } from '@metamask/subject-metadata-controller'; +import { SubjectType } from '@metamask/permission-controller'; ///: BEGIN:ONLY_INCLUDE_IN(snaps) import { WALLET_SNAP_PERMISSION_KEY } from '@metamask/rpc-methods'; ///: END:ONLY_INCLUDE_IN diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js index 041fc765b182..6cd1d6fa1028 100644 --- a/ui/selectors/selectors.js +++ b/ui/selectors/selectors.js @@ -1,5 +1,5 @@ ///: BEGIN:ONLY_INCLUDE_IN(snaps) -import { SubjectType } from '@metamask/subject-metadata-controller'; +import { SubjectType } from '@metamask/permission-controller'; ///: END:ONLY_INCLUDE_IN import { ApprovalType } from '@metamask/controller-utils'; import { diff --git a/yarn.lock b/yarn.lock index 09f068146c4e..6331cf6ce069 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3844,16 +3844,6 @@ __metadata: languageName: node linkType: hard -"@metamask/base-controller@npm:^2.0.0": - version: 2.0.0 - resolution: "@metamask/base-controller@npm:2.0.0" - dependencies: - "@metamask/controller-utils": "npm:^3.0.0" - immer: "npm:^9.0.6" - checksum: f6493b129c39017b73da09d181f6d57175523596aa6e6febb446008ac362182da4cb15cab4cd2635a651dc24abe028b609d10fffa98fd44a1366d620d865c53c - languageName: node - linkType: hard - "@metamask/base-controller@npm:^3.0.0, @metamask/base-controller@npm:^3.1.0, @metamask/base-controller@npm:^3.2.0, @metamask/base-controller@npm:^3.2.1, @metamask/base-controller@npm:^3.2.2": version: 3.2.2 resolution: "@metamask/base-controller@npm:3.2.2" @@ -3878,21 +3868,6 @@ __metadata: languageName: node linkType: hard -"@metamask/controller-utils@npm:^3.0.0, @metamask/controller-utils@npm:^3.4.0": - version: 3.4.0 - resolution: "@metamask/controller-utils@npm:3.4.0" - dependencies: - "@metamask/utils": "npm:^5.0.1" - "@spruceid/siwe-parser": "npm:1.1.3" - eth-ens-namehash: "npm:^2.0.8" - eth-rpc-errors: "npm:^4.0.2" - ethereumjs-util: "npm:^7.0.10" - ethjs-unit: "npm:^0.1.6" - fast-deep-equal: "npm:^3.1.3" - checksum: 27b216dde64bf53e723a91f32426bb25f07aa3e0a241830046c122f9b00dac28a3e0aaa5335df759618eccc5d75553fb987b24daa712ae62fadb8114920859a1 - languageName: node - linkType: hard - "@metamask/controller-utils@npm:^4.0.0, @metamask/controller-utils@npm:^4.1.0, @metamask/controller-utils@npm:^4.2.0, @metamask/controller-utils@npm:^4.3.0, @metamask/controller-utils@npm:^4.3.2": version: 4.3.2 resolution: "@metamask/controller-utils@npm:4.3.2" @@ -4510,26 +4485,6 @@ __metadata: languageName: node linkType: hard -"@metamask/permission-controller@npm:^3.0.0": - version: 3.2.0 - resolution: "@metamask/permission-controller@npm:3.2.0" - dependencies: - "@metamask/approval-controller": "npm:^2.1.1" - "@metamask/base-controller": "npm:^2.0.0" - "@metamask/controller-utils": "npm:^3.4.0" - "@metamask/types": "npm:^1.1.0" - "@types/deep-freeze-strict": "npm:^1.1.0" - deep-freeze-strict: "npm:^1.1.1" - eth-rpc-errors: "npm:^4.0.2" - immer: "npm:^9.0.6" - json-rpc-engine: "npm:^6.1.0" - nanoid: "npm:^3.1.31" - peerDependencies: - "@metamask/approval-controller": ^2.1.1 - checksum: 27a5cf44dabd51b6b1a0db2de597aad15ed4fba7345717ae9975471559e24e7dac5aaf4e23800d75e5800315b22b1421648f1c38b8d4fcde35c75fd22b41c5b5 - languageName: node - linkType: hard - "@metamask/permission-controller@npm:^4.0.0, @metamask/permission-controller@npm:^4.1.0": version: 4.1.1 resolution: "@metamask/permission-controller@npm:4.1.1" @@ -4904,18 +4859,6 @@ __metadata: languageName: node linkType: hard -"@metamask/subject-metadata-controller@npm:^2.0.0": - version: 2.0.0 - resolution: "@metamask/subject-metadata-controller@npm:2.0.0" - dependencies: - "@metamask/base-controller": "npm:^2.0.0" - "@metamask/permission-controller": "npm:^3.0.0" - "@metamask/types": "npm:^1.1.0" - immer: "npm:^9.0.6" - checksum: 06e1c952f6300340e5e515e3cd623e8d2e5f59856a94726304082f96ae1fadf3361b39dc106755a4295ce72013d77c881c3509de80ae21a5261753293ac18ba2 - languageName: node - linkType: hard - "@metamask/swappable-obj-proxy@npm:^2.1.0": version: 2.1.0 resolution: "@metamask/swappable-obj-proxy@npm:2.1.0" @@ -23907,7 +23850,6 @@ __metadata: "@metamask/snaps-controllers": "npm:^2.0.2" "@metamask/snaps-ui": "npm:^2.0.0" "@metamask/snaps-utils": "npm:^2.0.1" - "@metamask/subject-metadata-controller": "npm:^2.0.0" "@metamask/test-dapp": "npm:^7.1.0" "@metamask/utils": "npm:^5.0.0" "@ngraveio/bc-ur": "npm:^1.1.6" From bef7aa98de9a7eaeca92079afaf3bd18884a9057 Mon Sep 17 00:00:00 2001 From: Gustavo Antunes <17601467+gantunesr@users.noreply.github.com> Date: Mon, 9 Oct 2023 08:52:19 -0300 Subject: [PATCH 070/219] feat: update snap label to include "Beta" keyword (#21222) Update the snap account label from `Snaps` to `Snaps (Beta)`. --- test/e2e/accounts/test-snap-accounts.spec.js | 5 ++++- .../multichain/account-list-item/account-list-item.js | 2 +- .../multichain/account-list-item/account-list-item.test.js | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/e2e/accounts/test-snap-accounts.spec.js b/test/e2e/accounts/test-snap-accounts.spec.js index 91adb3e6ba99..3dc034d687da 100644 --- a/test/e2e/accounts/test-snap-accounts.spec.js +++ b/test/e2e/accounts/test-snap-accounts.spec.js @@ -373,7 +373,10 @@ describe('Test Snap Account', function () { // click on Accounts await driver.clickElement('[data-testid="account-menu-icon"]'); - const label = await driver.findElement({ css: '.mm-tag', text: 'Snaps' }); + const label = await driver.findElement({ + css: '.mm-tag', + text: 'Snaps (Beta)', + }); label.click(); diff --git a/ui/components/multichain/account-list-item/account-list-item.js b/ui/components/multichain/account-list-item/account-list-item.js index 77f35610235c..e154dcd0d224 100644 --- a/ui/components/multichain/account-list-item/account-list-item.js +++ b/ui/components/multichain/account-list-item/account-list-item.js @@ -64,7 +64,7 @@ function getLabel(keyring = {}, t) { return HardwareKeyringNames.lattice; ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) case KeyringType.snap: - return t('snaps'); + return `${t('snaps')} (${t('beta')})`; ///: END:ONLY_INCLUDE_IN default: return null; diff --git a/ui/components/multichain/account-list-item/account-list-item.test.js b/ui/components/multichain/account-list-item/account-list-item.test.js index 354fdac0c2c1..3badaaadf7dc 100644 --- a/ui/components/multichain/account-list-item/account-list-item.test.js +++ b/ui/components/multichain/account-list-item/account-list-item.test.js @@ -113,7 +113,7 @@ describe('AccountListItem', () => { }, }); - expect(getByText('Snaps')).toBeInTheDocument(); + expect(getByText('Snaps (Beta)')).toBeInTheDocument(); }); ///: END:ONLY_INCLUDE_IN }); From ac541c13d264762877011dfd13e4d2a7b54dab11 Mon Sep 17 00:00:00 2001 From: Monte Lai Date: Mon, 9 Oct 2023 20:03:17 +0800 Subject: [PATCH 071/219] fix: make snap card clickable (#21232) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This PR makes the Snap card clickable. ## **Manual testing steps** 1. Go to settings, then experimental and toggle Add Snap Account 2. Click on the account menu 3. Click on add snap account 4. Click on a snap card 5. You will then be directed to the snap detail page. ## **Screenshots/Recordings** ### **After* https://github.com/MetaMask/metamask-extension/assets/96463427/2bcfd4c8-4d54-47d9-a114-68be8b064aef ## **Related issues** Resolves https://github.com/MetaMask/accounts-planning/issues/47 ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [x] I’ve indicated what issue this PR is linked to: Fixes #??? - [x] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [x] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [x] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [x] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [x] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- .../keyring-snaps/snap-card/snap-card.test.tsx | 16 ++++++++++++++++ ui/pages/keyring-snaps/snap-card/snap-card.tsx | 3 +++ 2 files changed, 19 insertions(+) diff --git a/ui/pages/keyring-snaps/snap-card/snap-card.test.tsx b/ui/pages/keyring-snaps/snap-card/snap-card.test.tsx index 94b128d9e311..780d676ec655 100644 --- a/ui/pages/keyring-snaps/snap-card/snap-card.test.tsx +++ b/ui/pages/keyring-snaps/snap-card/snap-card.test.tsx @@ -81,4 +81,20 @@ describe('SnapCard', () => { }); expect(getByText(messages.snapUpdateAvailable.message)).toBeInTheDocument(); }); + + it('should direct to snap details when the card is clicked', async () => { + const { getByTestId } = renderComponent({ + ...snap, + isInstalled: false, + updateAvailable: false, + }); + + const card = getByTestId('key-management-snap'); + + fireEvent.click(card); + + await waitFor(() => { + expect(mockHistoryPush).toHaveBeenCalled(); + }); + }); }); diff --git a/ui/pages/keyring-snaps/snap-card/snap-card.tsx b/ui/pages/keyring-snaps/snap-card/snap-card.tsx index 537acde8f65f..f604ac0be3d8 100644 --- a/ui/pages/keyring-snaps/snap-card/snap-card.tsx +++ b/ui/pages/keyring-snaps/snap-card/snap-card.tsx @@ -54,6 +54,9 @@ export default function SnapCard({ borderWidth={1} padding={[4, 4, 4, 4]} data-testid="key-management-snap" + onClick={() => { + history.push(`/add-snap-account/${id}`); + }} > Date: Mon, 9 Oct 2023 20:24:22 +0800 Subject: [PATCH 072/219] feat: show checksum address when removing snap account (#21252) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This pr will change the address to a checksum address on the remove snap account popup. ## **Manual testing steps** 1. Start MM Flask 2. Go to https://metamask.github.io/snap-simple-keyring/latest/ 3. Install the snap 4. Create an account 5. Copy the uuid of the account 6. Go to remove account and paste the uuid 7. Click the remove account button 8. A new popup should appear with the checksum address ## **Screenshots/Recordings** ### **Before** Screenshot 2023-10-09 at 09 52 18 ### **After** Screenshot 2023-10-09 at 09 50 08 ## **Related issues** Resolves https://github.com/MetaMask/accounts-planning/issues/73 ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [x] I’ve indicated what issue this PR is linked to: Fixes #??? - [ x] I’ve included tests if applicable. - [x] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [x] I’ve properly set the pull request status: - [x] In case it's not yet "ready for review", I've set it to "draft". - [x] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [x] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [x] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- .../remove-snap-account.test.tsx | 28 +++++++++++++++++++ .../remove-snap-account.tsx | 3 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 ui/pages/remove-snap-account/remove-snap-account.test.tsx diff --git a/ui/pages/remove-snap-account/remove-snap-account.test.tsx b/ui/pages/remove-snap-account/remove-snap-account.test.tsx new file mode 100644 index 000000000000..ca6c2661e7ad --- /dev/null +++ b/ui/pages/remove-snap-account/remove-snap-account.test.tsx @@ -0,0 +1,28 @@ +import React from 'react'; +import configureMockStore from 'redux-mock-store'; +import { renderWithProvider } from '../../../test/lib/render-helpers'; +import { toChecksumHexAddress } from '../../../shared/modules/hexstring-utils'; +import mockState from '../../../test/data/mock-state.json'; +import RemoveSnapAccount from './remove-snap-account'; + +const defaultProps = { + snapId: 'npm:@mock-snap', + snapName: 'mock-name', + publicAddress: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc', +}; + +describe('RemoveSnapAccount', () => { + it('should return checksum address', async () => { + const mockStore = configureMockStore([])(mockState); + const { getByText } = renderWithProvider( + , + mockStore, + ); + + const expectedCheckSumAddress = toChecksumHexAddress( + defaultProps.publicAddress, + ); + + expect(getByText(expectedCheckSumAddress)).toBeInTheDocument(); + }); +}); diff --git a/ui/pages/remove-snap-account/remove-snap-account.tsx b/ui/pages/remove-snap-account/remove-snap-account.tsx index 4f2778fea233..bdf4ba9f17d1 100644 --- a/ui/pages/remove-snap-account/remove-snap-account.tsx +++ b/ui/pages/remove-snap-account/remove-snap-account.tsx @@ -8,6 +8,7 @@ import { Display, FlexDirection, } from '../../helpers/constants/design-system'; +import { toChecksumHexAddress } from '../../../shared/modules/hexstring-utils'; import { RemoveSnapAccountContent } from './components'; export interface RemoveSnapAccountProps { @@ -42,7 +43,7 @@ const RemoveSnapAccount = ({ From bd48d44a4b8440943e6ed010aed0620a149e6b24 Mon Sep 17 00:00:00 2001 From: Pedro Figueiredo Date: Mon, 9 Oct 2023 15:23:47 +0100 Subject: [PATCH 073/219] network details validation for json rpc req (#21260) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This PR addresses adding custom network validation via the JSON RPC request flow. It accomplishes that by using the existing `useSafeChainsListValidation` boolean in the appropriate place in the `add-ethereum-chain.js` file. One e2e test is added to cover this scenario. ## **Manual testing steps** See #21208 ## **Related issues** Fixes: #21208 ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've clearly explained: - [ ] What problem this PR is solving. - [ ] How this problem was solved. - [ ] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- test/e2e/tests/add-custom-network.spec.js | 94 ++++++++++++++++++- .../templates/add-ethereum-chain.js | 8 +- 2 files changed, 98 insertions(+), 4 deletions(-) diff --git a/test/e2e/tests/add-custom-network.spec.js b/test/e2e/tests/add-custom-network.spec.js index 84024ed0582c..82233d09b34b 100644 --- a/test/e2e/tests/add-custom-network.spec.js +++ b/test/e2e/tests/add-custom-network.spec.js @@ -163,6 +163,7 @@ describe('Custom network', function () { dapp: true, fixtures: new FixtureBuilder() .withPermissionControllerConnectedToTestDapp() + .withPreferencesController({ useSafeChainsListValidation: true }) .build(), title: this.test.title, }, @@ -195,6 +196,27 @@ describe('Custom network', function () { windowHandles, ); + const warningMsg1 = + 'According to our record the network name may not correctly match this chain ID.'; + await driver.findElement({ + tag: 'span', + text: warningMsg1, + }); + + const errorMsg1 = + 'The submitted currency symbol does not match what we expect for this chain ID.'; + await driver.findElement({ + tag: 'span', + text: errorMsg1, + }); + + const errorMsg2 = + 'According to our records the submitted RPC URL value does not match a known provider for this chain ID.'; + await driver.findElement({ + tag: 'span', + text: errorMsg2, + }); + const errMsg1 = 'verify the network details'; await driver.findElement({ tag: 'a', @@ -227,6 +249,76 @@ describe('Custom network', function () { ); }); + it("don't validate bad rpc custom network when toggle is off", async function () { + async function mockRPCURLAndChainId(mockServer) { + return [ + await mockServer + .forPost('https://responsive-rpc.url/') + .thenCallback(() => ({ + statusCode: 200, + json: { + id: '1694444405781', + jsonrpc: '2.0', + result: TEST_CHAIN_ID, + }, + })), + ]; + } + + await withFixtures( + { + dapp: true, + fixtures: new FixtureBuilder() + .withPermissionControllerConnectedToTestDapp() + .withPreferencesController({ useSafeChainsListValidation: false }) + .build(), + title: this.test.title, + testSpecificMock: mockRPCURLAndChainId, + }, + async ({ driver }) => { + await driver.navigate(); + await unlockWallet(driver); + + await openDapp(driver); + await driver.executeScript(` + var params = [{ + chainId: "${TEST_CHAIN_ID}", + chainName: "Antani", + nativeCurrency: { + name: "", + symbol: "ANTANI", + decimals: 18 + }, + rpcUrls: ["https://responsive-rpc.url/"], + blockExplorerUrls: [ "http://localhost:8080/api/customRPC" ] + }] + window.ethereum.request({ + method: 'wallet_addEthereumChain', + params + }) + `); + const windowHandles = await driver.waitUntilXWindowHandles(3); + + await driver.switchToWindowWithTitle( + 'MetaMask Notification', + windowHandles, + ); + + await driver.clickElement({ + tag: 'button', + text: 'Approve', + }); + + const switchNetworkBtn = await driver.findElement({ + tag: 'button', + text: 'Switch network', + }); + + await switchNetworkBtn.click(); + }, + ); + }); + it("don't add unreachable custom network", async function () { await withFixtures( { @@ -470,7 +562,7 @@ describe('Custom network', function () { ); }); - it('when the network details validation toggle is turned on, validate user inserted details against data from "chainid.network"', async function () { + it("when the network details validation toggle is turned on, validate user inserted details against data from 'chainid.network'", async function () { async function mockRPCURLAndChainId(mockServer) { return [ await mockServer diff --git a/ui/pages/confirmation/templates/add-ethereum-chain.js b/ui/pages/confirmation/templates/add-ethereum-chain.js index 74b0ee03feb7..f70ed37f692f 100644 --- a/ui/pages/confirmation/templates/add-ethereum-chain.js +++ b/ui/pages/confirmation/templates/add-ethereum-chain.js @@ -133,11 +133,13 @@ const ERROR_CONNECTING_TO_RPC = { async function getAlerts(pendingApproval, state) { const alerts = []; - const safeChainsList = - (await fetchWithCache({ + let safeChainsList = []; + if (state.useSafeChainsListValidation) { + safeChainsList = await fetchWithCache({ url: 'https://chainid.network/chains.json', functionName: 'getSafeChainsList', - })) || []; + }); + } const matchedChain = safeChainsList.find( (chain) => chain.chainId === parseInt(pendingApproval.requestData.chainId, 16), From 9e1172d9477cf1488ff133e167ec57e455c39b5b Mon Sep 17 00:00:00 2001 From: Monte Lai Date: Tue, 10 Oct 2023 00:36:57 +0800 Subject: [PATCH 074/219] Add keyring snap removal confirmation (#20998) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This feature adds an extra confirmation prior to the removal of a keyring snap. The confirmation will display the accounts that are associated to the snap and warn the user that these accounts will be deleted. The confirmation also includes user friction to type in the snap name prior to the removal. Related to: https://github.com/MetaMask/accounts-planning/issues/13 ## **Manual testing steps** 1. Start metamask flask 2. Install [Snap Simple Keyring version 0.2.2](https://metamask.github.io/snap-simple-keyring/0.2.2/) 3. Create an account 4. On the metamask extension, click on settings 5. Click on snaps 6. Select the Snap Simple Keyring 7. Click on `Remove Metamask Snap Simple Keyring` 8. Click `Continue` 9. Enter the snap name and click `Remove Snap` ## **Screenshots/Recordings** ### **Before** ![remove snap confirmation 5](https://github.com/MetaMask/metamask-extension/assets/96463427/32cc6a3a-17a3-486f-bda9-987c8a2d3de2) ### **After** ![remove snap confirmation 1](https://github.com/MetaMask/metamask-extension/assets/17601467/574f9830-f268-46b4-9dcb-2d5a9e3ca9b0) ![remove snap confirmation 2](https://github.com/MetaMask/metamask-extension/assets/17601467/8769e427-7323-4c2b-b419-1a7bb9df83ea) Success Case: ![remove snap confirmation 3](https://github.com/MetaMask/metamask-extension/assets/96463427/d6e649e3-cfd8-4043-aa02-b1b338b5d96d) Failure Case: ![remove snap confirmation 4](https://github.com/MetaMask/metamask-extension/assets/96463427/13584eca-2ae9-4095-b94e-d1108266b537) ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [x] I’ve indicated what issue this PR is linked to: Fixes #??? - [x] I’ve included tests if applicable. - [x] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [x] I’ve properly set the pull request status: - [x] In case it's not yet "ready for review", I've set it to "draft". - [x] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [x] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [x] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --------- Co-authored-by: gantunesr Co-authored-by: Gustavo Antunes <17601467+gantunesr@users.noreply.github.com> Co-authored-by: MetaMask Bot --- app/_locales/en/messages.json | 27 +++ .../test-remove-accounts-snap.spec.js | 21 +- test/e2e/accounts/test-snap-accounts.spec.js | 77 +++++++ .../keyring-snap-removal-modal/index.ts | 1 + ...keyring-snap-removal-result-modal.test.tsx | 62 ++++++ .../keyring-snap-removal-result-modal.tsx | 83 ++++++++ .../keyring-snap-removal-warning/index.ts | 1 + .../keyring-account-list-item.tsx | 74 +++++++ .../keyring-snap-removal-warning.stories.js | 43 ++++ .../keyring-snap-removal-warning.test.tsx | 160 ++++++++++++++ .../keyring-snap-removal-warning.tsx | 196 ++++++++++++++++++ .../snap-settings-card/snap-settings-card.js | 1 + ui/ducks/app/app.ts | 30 +++ ui/pages/routes/routes.component.js | 21 ++ ui/pages/routes/routes.container.js | 11 + .../settings/snaps/view-snap/constants.ts | 5 + .../settings/snaps/view-snap/view-snap.js | 84 +++++++- ui/selectors/selectors.js | 16 ++ ui/store/actionConstants.ts | 7 + ui/store/actions.ts | 25 +++ 20 files changed, 940 insertions(+), 5 deletions(-) create mode 100644 ui/components/app/modals/keyring-snap-removal-modal/index.ts create mode 100644 ui/components/app/modals/keyring-snap-removal-modal/keyring-snap-removal-result-modal.test.tsx create mode 100644 ui/components/app/modals/keyring-snap-removal-modal/keyring-snap-removal-result-modal.tsx create mode 100644 ui/components/app/snaps/keyring-snap-removal-warning/index.ts create mode 100644 ui/components/app/snaps/keyring-snap-removal-warning/keyring-account-list-item.tsx create mode 100644 ui/components/app/snaps/keyring-snap-removal-warning/keyring-snap-removal-warning.stories.js create mode 100644 ui/components/app/snaps/keyring-snap-removal-warning/keyring-snap-removal-warning.test.tsx create mode 100644 ui/components/app/snaps/keyring-snap-removal-warning/keyring-snap-removal-warning.tsx create mode 100644 ui/pages/settings/snaps/view-snap/constants.ts diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 2218a1f51446..efad71ef0939 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -507,6 +507,9 @@ "backupApprovalNotice": { "message": "Backup your Secret Recovery Phrase to keep your wallet and funds secure." }, + "backupKeyringSnapReminder": { + "message": "Be sure you can access any accounts created by this Snap on your own before removing it" + }, "backupNow": { "message": "Backup now" }, @@ -2164,6 +2167,24 @@ "message": "JSON File", "description": "format for importing an account" }, + "keyringAccountName": { + "message": "Account name" + }, + "keyringAccountPublicAddress": { + "message": "Public Address" + }, + "keyringSnapRemovalResult1": { + "message": "$1 $2removed", + "description": "Displays the result after removal of a keyring snap. $1 is the snap name, $2 is whether it is successful or not" + }, + "keyringSnapRemovalResultNotSuccessful": { + "message": "not ", + "description": "Displays the `not` word in $2." + }, + "keyringSnapRemoveConfirmation": { + "message": "Type $1 to confirm you want to remove this snap:", + "description": "Asks user to input the name nap prior to deleting the snap. $1 is the snap name" + }, "keystone": { "message": "Keystone" }, @@ -3649,6 +3670,12 @@ "removeJWTDescription": { "message": "Are you sure you want to remove this token? All accounts assigned to this token will be removed from extension as well: " }, + "removeKeyringSnap": { + "message": "Removing this Snap removes these accounts from MetaMask:" + }, + "removeKeyringSnapToolTip": { + "message": "The snap controls the accounts, and by removing it, the accounts will be removed from MetaMask, too, but they will remain in the blockchain." + }, "removeNFT": { "message": "Remove NFT" }, diff --git a/test/e2e/accounts/test-remove-accounts-snap.spec.js b/test/e2e/accounts/test-remove-accounts-snap.spec.js index 850eca6a1f72..114964acacd8 100644 --- a/test/e2e/accounts/test-remove-accounts-snap.spec.js +++ b/test/e2e/accounts/test-remove-accounts-snap.spec.js @@ -107,11 +107,26 @@ describe('Remove Account Snap', function () { await driver.clickElement('.toggle-button > div'); // Remove the snap. + const removeButton = await driver.findElement( + '[data-testid="remove-snap-button"]', + ); + await driver.scrollToElement(removeButton); + await driver.clickElement('[data-testid="remove-snap-button"]'); + await driver.clickElement({ - text: 'Remove MetaMask Simple Snap Keyring', - tag: 'p', + text: 'Continue', + tag: 'button', + }); + + await driver.fill( + '[data-testid="remove-snap-confirmation-input"]', + 'MetaMask Simple Snap Keyring', + ); + + await driver.clickElement({ + text: 'Remove Snap', + tag: 'button', }); - await driver.clickElement('#popoverRemoveSnapButton'); // Assert that the snap was removed. const removeResult = await driver.findElement( diff --git a/test/e2e/accounts/test-snap-accounts.spec.js b/test/e2e/accounts/test-snap-accounts.spec.js index 3dc034d687da..6a22aa829a1e 100644 --- a/test/e2e/accounts/test-snap-accounts.spec.js +++ b/test/e2e/accounts/test-snap-accounts.spec.js @@ -1,3 +1,4 @@ +const { strict: assert } = require('assert'); const util = require('ethereumjs-util'); const FixtureBuilder = require('../fixture-builder'); const { @@ -6,6 +7,7 @@ const { openDapp, PRIVATE_KEY, PRIVATE_KEY_TWO, + defaultGanacheOptions, sendTransaction, switchToNotificationWindow, switchToOrOpenDapp, @@ -59,6 +61,81 @@ describe('Test Snap Account', function () { ); }); + it('will display the keyring snap account removal warning', async function () { + await withFixtures( + { + fixtures: new FixtureBuilder().build(), + ganacheOptions: defaultGanacheOptions, + failOnConsoleError: false, + title: this.test.title, + }, + async ({ driver }) => { + await installSnapSimpleKeyring(driver, false); + + await makeNewAccountAndSwitch(driver); + + const windowHandles = await driver.waitUntilXWindowHandles( + 2, + 1000, + 10000, + ); + + // switch to metamask extension + await driver.switchToWindowWithTitle( + WINDOW_TITLES.ExtensionInFullScreenView, + windowHandles, + ); + + await driver.clickElement( + '[data-testid="account-options-menu-button"]', + ); + + await driver.clickElement({ text: 'Settings', tag: 'div' }); + + await driver.clickElement({ text: 'Snaps', tag: 'div' }); + + await driver.clickElement( + '[data-testid="npm:@metamask/snap-simple-keyring-snap"]', + ); + + const removeButton = await driver.findElement( + '[data-testid="remove-snap-button"]', + ); + await driver.scrollToElement(removeButton); + await driver.clickElement('[data-testid="remove-snap-button"]'); + + assert.equal( + await driver.isElementPresentAndVisible({ text: 'Account 2' }), + true, + ); + + await driver.clickElement({ + text: 'Continue', + tag: 'button', + }); + + await driver.fill( + '[data-testid="remove-snap-confirmation-input"]', + 'MetaMask Simple Snap Keyring', + ); + + await driver.clickElement({ + text: 'Remove Snap', + tag: 'button', + }); + + // Checking result modal + assert.equal( + await driver.isElementPresentAndVisible({ + text: 'MetaMask Simple Snap Keyring removed', + tag: 'p', + }), + true, + ); + }, + ); + }); + it('can import a private key and transfer 1 ETH (sync flow)', async function () { await withFixtures( accountSnapFixtures(this.test.title), diff --git a/ui/components/app/modals/keyring-snap-removal-modal/index.ts b/ui/components/app/modals/keyring-snap-removal-modal/index.ts new file mode 100644 index 000000000000..55f9f764ea0b --- /dev/null +++ b/ui/components/app/modals/keyring-snap-removal-modal/index.ts @@ -0,0 +1 @@ +export { default } from './keyring-snap-removal-result-modal'; diff --git a/ui/components/app/modals/keyring-snap-removal-modal/keyring-snap-removal-result-modal.test.tsx b/ui/components/app/modals/keyring-snap-removal-modal/keyring-snap-removal-result-modal.test.tsx new file mode 100644 index 000000000000..9f8536ce81c2 --- /dev/null +++ b/ui/components/app/modals/keyring-snap-removal-modal/keyring-snap-removal-result-modal.test.tsx @@ -0,0 +1,62 @@ +import React from 'react'; +import configureMockStore from 'redux-mock-store'; +import mockStore from '../../../../../test/data/mock-state.json'; +import { + fireEvent, + renderWithProvider, + waitFor, +} from '../../../../../test/jest'; +import KeyringSnapRemovalResult from './keyring-snap-removal-result-modal'; + +const mockOnClose = jest.fn(); + +const defaultArgs = { + isOpen: true, + onClose: mockOnClose, +}; + +const getStoreWithModalData = ({ + snapName, + result, +}: { + snapName: string; + result: 'success' | 'failed'; +}) => { + return configureMockStore()({ + ...mockStore, + + appState: { + ...mockStore.appState, + keyringRemovalSnapModal: { + snapName, + result, + }, + }, + }); +}; + +describe('Keyring Snap Remove Result', () => { + it('show render the success message', async () => { + const { getByText, getByLabelText } = renderWithProvider( + , + getStoreWithModalData({ snapName: 'mock-snap', result: 'success' }), + ); + + expect(getByText('mock-snap removed')).toBeInTheDocument(); + + const closeButton = getByLabelText('Close'); + + fireEvent.click(closeButton); + + await waitFor(() => { + expect(mockOnClose).toHaveBeenCalled(); + }); + }); + it('show render the failure message', () => { + const { getByText } = renderWithProvider( + , + getStoreWithModalData({ snapName: 'mock-snap', result: 'failed' }), + ); + expect(getByText('mock-snap not removed')).toBeInTheDocument(); + }); +}); diff --git a/ui/components/app/modals/keyring-snap-removal-modal/keyring-snap-removal-result-modal.tsx b/ui/components/app/modals/keyring-snap-removal-modal/keyring-snap-removal-result-modal.tsx new file mode 100644 index 000000000000..6214164adff4 --- /dev/null +++ b/ui/components/app/modals/keyring-snap-removal-modal/keyring-snap-removal-result-modal.tsx @@ -0,0 +1,83 @@ +import React from 'react'; +import { useSelector } from 'react-redux'; +import { + FlexDirection, + AlignItems, + Display, + JustifyContent, + IconColor, + TextVariant, + TextAlign, +} from '../../../../helpers/constants/design-system'; +import { + Box, + Icon, + IconName, + IconSize, + Modal, + ModalContent, + ModalHeader, + ModalOverlay, + Text, +} from '../../../component-library'; +import { useI18nContext } from '../../../../hooks/useI18nContext'; +import { getKeyringSnapRemovalResult } from '../../../../selectors'; + +const KeyringSnapRemovalResult = ({ + isOpen, + onClose, +}: { + isOpen: boolean; + onClose: () => void; +}) => { + const t = useI18nContext(); + const snapRemovalResult = useSelector(getKeyringSnapRemovalResult); + + return ( + <> + onClose()}> + + + {''} + + + + {t('keyringSnapRemovalResult1', [ + snapRemovalResult.snapName, + snapRemovalResult.result === 'failed' + ? t('keyringSnapRemovalResultNotSuccessful') + : '', + ])} + + + + + + ); +}; + +export default KeyringSnapRemovalResult; diff --git a/ui/components/app/snaps/keyring-snap-removal-warning/index.ts b/ui/components/app/snaps/keyring-snap-removal-warning/index.ts new file mode 100644 index 000000000000..85d2c02bb062 --- /dev/null +++ b/ui/components/app/snaps/keyring-snap-removal-warning/index.ts @@ -0,0 +1 @@ +export { default } from './keyring-snap-removal-warning'; diff --git a/ui/components/app/snaps/keyring-snap-removal-warning/keyring-account-list-item.tsx b/ui/components/app/snaps/keyring-snap-removal-warning/keyring-account-list-item.tsx new file mode 100644 index 000000000000..1dcba243ebc6 --- /dev/null +++ b/ui/components/app/snaps/keyring-snap-removal-warning/keyring-account-list-item.tsx @@ -0,0 +1,74 @@ +import React from 'react'; +import { ButtonIcon, IconName, Text, Box } from '../../../component-library'; +import { + BlockSize, + BorderColor, + BorderRadius, + Display, + FlexDirection, + IconColor, + JustifyContent, + OverflowWrap, + TextColor, +} from '../../../../helpers/constants/design-system'; +// import { toChecksumHexAddress } from '../../../../../../../shared/modules/hexstring-utils'; +import { toChecksumHexAddress } from '../../../../../shared/modules/hexstring-utils'; +import { useI18nContext } from '../../../../hooks/useI18nContext'; + +export const KeyringAccountListItem = ({ + account, + snapUrl, +}: { + account: { name: string; address: string }; + snapUrl: string; +}) => { + const t = useI18nContext(); + return ( + + + + {t('keyringAccountName')} + {account.name} + + + + {t('keyringAccountPublicAddress')} + + + {toChecksumHexAddress(account.address)} + + + + + { + global.platform.openTab({ + url: snapUrl, + }); + }} + /> + + + ); +}; diff --git a/ui/components/app/snaps/keyring-snap-removal-warning/keyring-snap-removal-warning.stories.js b/ui/components/app/snaps/keyring-snap-removal-warning/keyring-snap-removal-warning.stories.js new file mode 100644 index 000000000000..162cc96b0dff --- /dev/null +++ b/ui/components/app/snaps/keyring-snap-removal-warning/keyring-snap-removal-warning.stories.js @@ -0,0 +1,43 @@ +import React from 'react'; +import KeyringSnapRemovalWarning from './keyring-snap-removal-warning'; + +export default { + title: 'Components/App/Snaps/KeyringSnapRemovalWarning', + component: KeyringSnapRemovalWarning, + argTypes: { + onCancel: { + action: 'onCancel', + }, + onSubmit: { + action: 'onSubmit', + }, + snapName: { + control: 'text', + }, + snapUrl: { + control: 'text', + }, + isOpen: { + control: 'boolean', + }, + keyringAccounts: { + control: 'array', + }, + }, + args: { + snapName: 'ABC Snap', + snapUrl: 'mock-url', + isOpen: true, + keyringAccounts: [ + { + address: '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b', + + name: 'Test Account 2', + }, + ], + }, +}; + +export const DefaultStory = (args) => ; + +DefaultStory.storyName = 'Default'; diff --git a/ui/components/app/snaps/keyring-snap-removal-warning/keyring-snap-removal-warning.test.tsx b/ui/components/app/snaps/keyring-snap-removal-warning/keyring-snap-removal-warning.test.tsx new file mode 100644 index 000000000000..cc05fcddb4e2 --- /dev/null +++ b/ui/components/app/snaps/keyring-snap-removal-warning/keyring-snap-removal-warning.test.tsx @@ -0,0 +1,160 @@ +import React from 'react'; +import { waitFor, fireEvent } from '@testing-library/react'; +import configureMockStore from 'redux-mock-store'; +import { Snap } from '@metamask/snaps-utils'; +import mockStore from '../../../../../test/data/mock-state.json'; +import { renderWithProvider } from '../../../../../test/jest'; +import { toChecksumHexAddress } from '../../../../../shared/modules/hexstring-utils'; +import messages from '../../../../../app/_locales/en/messages.json'; +import KeyringSnapRemovalWarning from './keyring-snap-removal-warning'; + +const mockOnClose = jest.fn(); +const mockOnCancel = jest.fn(); +const mockOnBack = jest.fn(); +const mockOnSubmit = jest.fn(); + +const mockSnap = { + id: 'mock-snap-id', + manifest: { + proposedName: 'mock-snap', + }, +} as Snap; + +const defaultArgs = { + isOpen: true, + snap: mockSnap, + onClose: mockOnClose, + onCancel: mockOnCancel, + onBack: mockOnBack, + onSubmit: mockOnSubmit, + keyringAccounts: [ + { + address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc', + name: 'Test Account', + }, + { + address: '0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb', + name: 'Test Account 2', + }, + ], +}; + +describe('Keyring Snap Remove Warning', () => { + let store; + beforeAll(() => { + store = configureMockStore()(mockStore); + }); + + afterEach(() => { + jest.clearAllMocks(); + }); + it('show render the keyring snap warning and content', () => { + const { getByText } = renderWithProvider( + , + store, + ); + expect( + getByText(messages.backupKeyringSnapReminder.message), + ).toBeInTheDocument(); + expect(getByText(messages.removeKeyringSnap.message)).toBeInTheDocument(); + + for (const account of defaultArgs.keyringAccounts) { + expect(getByText(account.name)).toBeInTheDocument(); + expect( + getByText(toChecksumHexAddress(account.address)), + ).toBeInTheDocument(); + } + }); + + it('displays the keyring snap confirmation removal modal', async () => { + const { getByText, getByTestId, getAllByText } = renderWithProvider( + , + store, + ); + + const nextButton = getByText('Continue'); + + fireEvent.click(nextButton); + + await waitFor(() => { + // translation is broken into three pieces + expect(getByText(/Type/u)).toBeInTheDocument(); + expect( + getByText(mockSnap.manifest?.proposedName as string), + ).toBeInTheDocument(); + expect( + getByText(/to confirm you want to remove this snap:/u), + ).toBeInTheDocument(); + }); + + const confirmationInput = getByTestId('remove-snap-confirmation-input'); + + fireEvent.change(confirmationInput, { + target: { value: mockSnap.manifest?.proposedName }, + }); + + await waitFor(() => { + const removeSnapButton = getAllByText('Remove Snap')[1]; + expect(removeSnapButton).not.toBeDisabled(); + fireEvent.click(removeSnapButton); + expect(mockOnSubmit).toBeCalled(); + }); + }); + + it('opens block explorer for account', async () => { + global.platform = { openTab: jest.fn() }; + const { getByText, getAllByTestId } = renderWithProvider( + , + store, + ); + + const getAccountsToBeRemoved = getAllByTestId('keyring-account-list-item'); + expect(getAccountsToBeRemoved.length).toBe(2); + + expect(getByText(defaultArgs.keyringAccounts[0].name)).toBeInTheDocument(); + expect(getByText(defaultArgs.keyringAccounts[1].name)).toBeInTheDocument(); + + const accountLink = getAllByTestId('keyring-account-link'); + + fireEvent.click(accountLink[0]); + + await waitFor(() => { + expect(global.platform.openTab).toHaveBeenCalled(); + }); + }); + describe('#onBack', () => { + it('will dismiss modal if modal is showing accounts', async () => { + const { getByLabelText } = renderWithProvider( + , + store, + ); + + const backButton = getByLabelText('Back'); + + fireEvent.click(backButton); + + await waitFor(() => { + expect(mockOnBack).toHaveBeenCalled(); + }); + }); + + it('it will return to account list if modal is showing confirmation', async () => { + const { getByText, getByLabelText } = renderWithProvider( + , + store, + ); + + const continueButton = getByText('Continue'); + + fireEvent.click(continueButton); + + const backButton = getByLabelText('Back'); + + fireEvent.click(backButton); + + await waitFor(() => { + expect(mockOnBack).not.toHaveBeenCalled(); + }); + }); + }); +}); diff --git a/ui/components/app/snaps/keyring-snap-removal-warning/keyring-snap-removal-warning.tsx b/ui/components/app/snaps/keyring-snap-removal-warning/keyring-snap-removal-warning.tsx new file mode 100644 index 000000000000..261ba88207d0 --- /dev/null +++ b/ui/components/app/snaps/keyring-snap-removal-warning/keyring-snap-removal-warning.tsx @@ -0,0 +1,196 @@ +import React, { useState, useEffect } from 'react'; +import { getAccountLink } from '@metamask/etherscan-link'; +import { Snap } from '@metamask/snaps-utils'; +import { useSelector } from 'react-redux'; +import { + BannerAlert, + BannerAlertSeverity, + Box, + Button, + ButtonSize, + ButtonVariant, + Modal, + ModalContent, + ModalHeader, + ModalOverlay, + Text, + TextField, +} from '../../../component-library'; +import { + BlockSize, + Display, + FlexDirection, + FontWeight, + JustifyContent, +} from '../../../../helpers/constants/design-system'; +import { useI18nContext } from '../../../../hooks/useI18nContext'; +import InfoTooltip from '../../../ui/info-tooltip'; +import { getProviderConfig } from '../../../../ducks/metamask/metamask'; +import { KeyringAccountListItem } from './keyring-account-list-item'; + +export default function KeyringRemovalSnapWarning({ + snap, + keyringAccounts, + onCancel, + onClose, + onSubmit, + onBack, + isOpen, +}: { + snap: Snap; + keyringAccounts: { name: string; address: string }[]; + onCancel: () => void; + onClose: () => void; + onSubmit: () => void; + onBack: () => void; + isOpen: boolean; +}) { + const t = useI18nContext(); + const [showConfirmation, setShowConfirmation] = useState(false); + const [confirmedRemoval, setConfirmedRemoval] = useState(false); + const [confirmationInput, setConfirmationInput] = useState(''); + const [error, setError] = useState(false); + const { chainId } = useSelector(getProviderConfig); + + useEffect(() => { + setShowConfirmation(keyringAccounts.length === 0); + }, [keyringAccounts]); + + const validateConfirmationInput = (input: string): boolean => { + setError(false); + if (input === snap.manifest.proposedName) { + return true; + } + setError(true); + return false; + }; + + return ( + <> + + + + { + if (showConfirmation) { + setShowConfirmation(false); + } else { + onBack(); + } + }} + onClose={() => { + setShowConfirmation(false); + onClose(); + }} + > + {t('removeSnap')} + + {showConfirmation === false ? ( + <> + + {t('backupKeyringSnapReminder')} + + + {t('removeKeyringSnap')} + + + {keyringAccounts.map((account, index) => { + return ( + + ); + })} + + ) : ( + <> + + + {t('backupKeyringSnapReminder')} + + + {t('keyringSnapRemoveConfirmation', [ + + {snap.manifest.proposedName} + , + ])} + + {/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */} + {/* @ts-ignore TODO: fix TextField props */} + { + setConfirmationInput(e.target.value); + setConfirmedRemoval( + validateConfirmationInput(e.target.value), + ); + }} + error={error} + inputProps={{ + 'data-testid': 'remove-snap-confirmation-input', + }} + type="text" + /> + + + )} + + + + + + + + ); +} diff --git a/ui/components/app/snaps/snap-settings-card/snap-settings-card.js b/ui/components/app/snaps/snap-settings-card/snap-settings-card.js index 184b042b4cae..fc0a1a1f7929 100644 --- a/ui/components/app/snaps/snap-settings-card/snap-settings-card.js +++ b/ui/components/app/snaps/snap-settings-card/snap-settings-card.js @@ -23,6 +23,7 @@ const SnapSettingsCard = ({ name, packageName, onClick, snapId }) => { return ( hideSelectActionModal()} /> ) : null} + { + ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) + isShowKeyringSnapRemovalResultModal && ( + hideShowKeyringSnapRemovalResultModal()} + /> + ) + ///: END:ONLY_INCLUDE_IN + } {isLoading ? : null} {!isLoading && isNetworkLoading ? : null} diff --git a/ui/pages/routes/routes.container.js b/ui/pages/routes/routes.container.js index 4773b65dea44..8e53215fc4d7 100644 --- a/ui/pages/routes/routes.container.js +++ b/ui/pages/routes/routes.container.js @@ -23,6 +23,9 @@ import { toggleAccountMenu, toggleNetworkMenu, hideImportTokensModal, + ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) + hideKeyringRemovalResultModal, + ///: END:ONLY_INCLUDE_IN } from '../../store/actions'; import { hideSelectActionModal } from '../../components/multichain/app-footer/app-footer-actions'; import { pageChanged } from '../../ducks/history/history'; @@ -71,6 +74,10 @@ function mapStateToProps(state) { isImportNftsModalOpen: state.appState.importNftsModal.open, isIpfsModalOpen: state.appState.showIpfsModalOpen, isSelectActionModalOpen: state.appState.showSelectActionModal, + ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) + isShowKeyringSnapRemovalResultModal: + state.appState.showKeyringRemovalSnapModal, + ///: END:ONLY_INCLUDE_IN }; } @@ -89,6 +96,10 @@ function mapDispatchToProps(dispatch) { hideIpfsModal: () => dispatch(hideIpfsModal()), hideImportTokensModal: () => dispatch(hideImportTokensModal()), hideSelectActionModal: () => dispatch(hideSelectActionModal()), + ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) + hideShowKeyringSnapRemovalResultModal: () => + dispatch(hideKeyringRemovalResultModal()), + ///: END:ONLY_INCLUDE_IN }; } diff --git a/ui/pages/settings/snaps/view-snap/constants.ts b/ui/pages/settings/snaps/view-snap/constants.ts new file mode 100644 index 000000000000..fb542711e4c2 --- /dev/null +++ b/ui/pages/settings/snaps/view-snap/constants.ts @@ -0,0 +1,5 @@ +export const KeyringSnapRemovalResultStatus = { + Success: 'success', + Failed: 'failed', + None: 'none', +}; diff --git a/ui/pages/settings/snaps/view-snap/view-snap.js b/ui/pages/settings/snaps/view-snap/view-snap.js index d383974977d4..8f364c5c74c7 100644 --- a/ui/pages/settings/snaps/view-snap/view-snap.js +++ b/ui/pages/settings/snaps/view-snap/view-snap.js @@ -18,12 +18,18 @@ import SnapAuthorshipExpanded from '../../../../components/app/snaps/snap-author import Box from '../../../../components/ui/box'; import SnapRemoveWarning from '../../../../components/app/snaps/snap-remove-warning'; import ConnectedSitesList from '../../../../components/app/connected-sites-list'; - +///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) +import KeyringSnapRemovalWarning from '../../../../components/app/snaps/keyring-snap-removal-warning'; +///: END:ONLY_INCLUDE_IN import { SNAPS_LIST_ROUTE } from '../../../../helpers/constants/routes'; import { removeSnap, removePermissionsFor, updateCaveat, + ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) + showKeyringSnapRemovalModal, + getSnapAccountsById, + ///: END:ONLY_INCLUDE_IN } from '../../../../store/actions'; import { getSnaps, @@ -31,12 +37,18 @@ import { getPermissions, getPermissionSubjects, getTargetSubjectMetadata, + ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) + getMemoizedMetaMaskIdentities, + ///: END:ONLY_INCLUDE_IN } from '../../../../selectors'; import { getSnapName } from '../../../../helpers/utils/util'; import { Text } from '../../../../components/component-library'; import SnapPermissionsList from '../../../../components/app/snaps/snap-permissions-list'; import { SnapDelineator } from '../../../../components/app/snaps/snap-delineator'; import { DelineatorType } from '../../../../helpers/constants/snaps'; +///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) +import { KeyringSnapRemovalResultStatus } from './constants'; +///: END:ONLY_INCLUDE_IN function ViewSnap() { const t = useI18nContext(); @@ -55,6 +67,12 @@ function ViewSnap() { const [isDescriptionOpen, setIsDescriptionOpen] = useState(false); const [isOverflowing, setIsOverflowing] = useState(false); + // eslint-disable-next-line no-unused-vars -- Main build does not use setKeyringAccounts + const [keyringAccounts, setKeyringAccounts] = useState([]); + ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) + const identities = useSelector(getMemoizedMetaMaskIdentities); + ///: END:ONLY_INCLUDE_IN + useEffect(() => { if (!snap) { history.push(SNAPS_LIST_ROUTE); @@ -79,6 +97,25 @@ function ViewSnap() { const targetSubjectMetadata = useSelector((state) => getTargetSubjectMetadata(state, snap?.id), ); + + let isKeyringSnap = false; + ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) + isKeyringSnap = Boolean(subjects[snap?.id]?.permissions?.snap_manageAccounts); + + useEffect(() => { + if (isKeyringSnap) { + (async () => { + const addresses = await getSnapAccountsById(snap.id); + const snapIdentities = Object.values(identities).filter((identity) => + addresses.includes(identity.address.toLowerCase()), + ); + setKeyringAccounts(snapIdentities); + })(); + } + }, [snap?.id, identities, isKeyringSnap]); + + ///: END:ONLY_INCLUDE_IN + const dispatch = useDispatch(); const onDisconnect = (connectedOrigin, snapId) => { @@ -180,6 +217,7 @@ function ViewSnap() { onClick={() => setIsShowingRemoveWarning(true)} > setIsShowingRemoveWarning(false)} onSubmit={async () => { await dispatch(removeSnap(snap.id)); }} snapName={snapName} /> + { + ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) + <> + setIsShowingRemoveWarning(false)} + onClose={() => setIsShowingRemoveWarning(false)} + onBack={() => setIsShowingRemoveWarning(false)} + onSubmit={async () => { + try { + await dispatch(removeSnap(snap.id)); + setIsShowingRemoveWarning(false); + dispatch( + showKeyringSnapRemovalModal({ + snapName, + result: KeyringSnapRemovalResultStatus.Success, + }), + ); + } catch { + setIsShowingRemoveWarning(false); + dispatch( + showKeyringSnapRemovalModal({ + snapName, + result: KeyringSnapRemovalResultStatus.Failed, + }), + ); + } + }} + isOpen={ + isShowingRemoveWarning && + isKeyringSnap && + keyringAccounts.length > 0 + } + /> + + ///: END:ONLY_INCLUDE_IN + } diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js index 6cd1d6fa1028..b70dbf4d6bb2 100644 --- a/ui/selectors/selectors.js +++ b/ui/selectors/selectors.js @@ -1747,4 +1747,20 @@ export function getSnapRegistry(state) { const { snapRegistryList } = state.metamask; return snapRegistryList; } + +export function getKeyringSnapAccounts(state) { + const identities = getMetaMaskIdentities(state); + + const keyringAccounts = Object.values(identities).filter((identity) => { + return ( + findKeyringForAddress(state, identity.address).type === 'Snap Keyring' + ); + }); + return keyringAccounts; +} + +export function getKeyringSnapRemovalResult(state) { + return state.appState.keyringRemovalSnapModal; +} + ///: END:ONLY_INCLUDE_IN diff --git a/ui/store/actionConstants.ts b/ui/store/actionConstants.ts index 1c94d42e569b..c38ae2a010b4 100644 --- a/ui/store/actionConstants.ts +++ b/ui/store/actionConstants.ts @@ -118,3 +118,10 @@ export const SET_CUSTOM_TOKEN_AMOUNT = 'SET_CUSTOM_TOKEN_AMOUNT'; ///: BEGIN:ONLY_INCLUDE_IN(desktop) export const FORCE_DISABLE_DESKTOP = 'FORCE_DISABLE_DESKTOP'; ///: END:ONLY_INCLUDE_IN + +///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) +export const SHOW_KEYRING_SNAP_REMOVAL_RESULT = + 'SHOW_KEYRING_SNAP_REMOVAL_RESULT'; +export const HIDE_KEYRING_SNAP_REMOVAL_RESULT = + 'HIDE_KEYRING_SNAP_REMOVAL_RESULT'; +///: END:ONLY_INCLUDE_IN diff --git a/ui/store/actions.ts b/ui/store/actions.ts index 6d1347df5d9c..5508c0ed4cdf 100644 --- a/ui/store/actions.ts +++ b/ui/store/actions.ts @@ -4471,6 +4471,31 @@ export async function setAddSnapAccountEnabled(value: boolean): Promise { logErrorWithMessage(error); } } + +export function showKeyringSnapRemovalModal(payload: { + snapName: string; + result: 'success' | 'failed'; +}) { + return { + type: actionConstants.SHOW_KEYRING_SNAP_REMOVAL_RESULT, + payload, + }; +} + +export function hideKeyringRemovalResultModal() { + return { + type: actionConstants.HIDE_KEYRING_SNAP_REMOVAL_RESULT, + }; +} + +export async function getSnapAccountsById(snapId: string): Promise { + const addresses: string[] = await submitRequestToBackground( + 'getAccountsBySnapId', + [snapId], + ); + + return addresses; +} ///: END:ONLY_INCLUDE_IN ///: BEGIN:ONLY_INCLUDE_IN(petnames) From 36a3f47f074cfce6c424d0edd36087d935b1d58e Mon Sep 17 00:00:00 2001 From: David Walsh Date: Mon, 9 Oct 2023 14:15:18 -0500 Subject: [PATCH 075/219] Fix #21179 - Change Optimism chain name to OP Mainnet (#21181) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** Changes "Optimism" chain name to "OP Mainnet" as requested. ## **Manual testing steps** 1. Open the Network Picker, click the "Add Network" button 2. On the Frequent RPC list, see "OP Mainnet" 3. Add that network, see "OP Mainnet" in the subsequent modals 4. Open the Network Picker, see the "OP Mainnet" item ## **Screenshots/Recordings** https://github.com/MetaMask/metamask-extension/assets/46655/83faabeb-1dc2-4a80-a0da-9b218c2f2b1f ## **Related issues** _Fixes #21179 ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've clearly explained: - [ ] What problem this PR is solving. - [ ] How this problem was solved. - [ ] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- app/_locales/de/messages.json | 3 --- app/_locales/el/messages.json | 3 --- app/_locales/en/messages.json | 4 ++-- app/_locales/es/messages.json | 3 --- app/_locales/fr/messages.json | 3 --- app/_locales/hi/messages.json | 3 --- app/_locales/id/messages.json | 3 --- app/_locales/ja/messages.json | 3 --- app/_locales/ko/messages.json | 3 --- app/_locales/pt/messages.json | 3 --- app/_locales/ru/messages.json | 3 --- app/_locales/tl/messages.json | 3 --- app/_locales/tr/messages.json | 3 --- app/_locales/vi/messages.json | 3 --- app/_locales/zh_CN/messages.json | 3 --- shared/constants/network.ts | 2 +- ui/pages/swaps/fee-card/fee-card.js | 2 +- ui/pages/swaps/prepare-swap-page/review-quote.js | 2 +- 18 files changed, 5 insertions(+), 47 deletions(-) diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index 55a032bc74c8..f45061b4a8fd 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -2387,9 +2387,6 @@ "networkNameGoerli": { "message": "Goerli" }, - "networkNameOptimism": { - "message": "Optimism" - }, "networkNamePolygon": { "message": "Polygon" }, diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index 5389e75ff1b8..35c3a19cf52a 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -2387,9 +2387,6 @@ "networkNameGoerli": { "message": "Goerli" }, - "networkNameOptimism": { - "message": "Optimism" - }, "networkNamePolygon": { "message": "Polygon" }, diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index efad71ef0939..fecf2b46a3a0 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -2550,8 +2550,8 @@ "networkNameGoerli": { "message": "Goerli" }, - "networkNameOptimism": { - "message": "Optimism" + "networkNameOpMainnet": { + "message": "OP Mainnet" }, "networkNamePolygon": { "message": "Polygon" diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 02e52fb7986d..c261c448fcbd 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -2387,9 +2387,6 @@ "networkNameGoerli": { "message": "Goerli" }, - "networkNameOptimism": { - "message": "Optimism" - }, "networkNamePolygon": { "message": "Polygon" }, diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index 125267970c51..9ccb1e2720c0 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -2387,9 +2387,6 @@ "networkNameGoerli": { "message": "Goerli" }, - "networkNameOptimism": { - "message": "Optimism" - }, "networkNamePolygon": { "message": "Polygon" }, diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index acc281a13a2f..9d1ef0186e2b 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -2387,9 +2387,6 @@ "networkNameGoerli": { "message": "गोएर्ली" }, - "networkNameOptimism": { - "message": "Optimism" - }, "networkNamePolygon": { "message": "बहुभुज" }, diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index f6a8a48116e3..10bbac7de0e5 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -2387,9 +2387,6 @@ "networkNameGoerli": { "message": "Goerli" }, - "networkNameOptimism": { - "message": "Optimism" - }, "networkNamePolygon": { "message": "Polygon" }, diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index ae8c1f77c5e7..149bbacc4fe7 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -2387,9 +2387,6 @@ "networkNameGoerli": { "message": "Goerli" }, - "networkNameOptimism": { - "message": "Optimism" - }, "networkNamePolygon": { "message": "Polygon" }, diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index 5b2561413742..053b7d67959c 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -2387,9 +2387,6 @@ "networkNameGoerli": { "message": "Goerli" }, - "networkNameOptimism": { - "message": "Optimism" - }, "networkNamePolygon": { "message": "Polygon" }, diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index a32ca5798450..3531889f42fc 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -2387,9 +2387,6 @@ "networkNameGoerli": { "message": "Goerli" }, - "networkNameOptimism": { - "message": "Optimism" - }, "networkNamePolygon": { "message": "Polygon" }, diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index 19ae6e28218f..d90737ed3180 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -2387,9 +2387,6 @@ "networkNameGoerli": { "message": "Goerli" }, - "networkNameOptimism": { - "message": "Optimism" - }, "networkNamePolygon": { "message": "Polygon" }, diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json index 29b68022119a..e6dc3f7b405d 100644 --- a/app/_locales/tl/messages.json +++ b/app/_locales/tl/messages.json @@ -2387,9 +2387,6 @@ "networkNameGoerli": { "message": "Goerli" }, - "networkNameOptimism": { - "message": "Optimism" - }, "networkNamePolygon": { "message": "Polygon" }, diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index 555774ac6cb2..cb0cdd1ddf29 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -2387,9 +2387,6 @@ "networkNameGoerli": { "message": "Goerli" }, - "networkNameOptimism": { - "message": "Optimism" - }, "networkNamePolygon": { "message": "Polygon" }, diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index 286961aa9a25..2f66586dffb5 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -2387,9 +2387,6 @@ "networkNameGoerli": { "message": "Goerli" }, - "networkNameOptimism": { - "message": "Optimism" - }, "networkNamePolygon": { "message": "Polygon" }, diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index e70f019379ee..35eca9b2ab29 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -2387,9 +2387,6 @@ "networkNameGoerli": { "message": "Goerli" }, - "networkNameOptimism": { - "message": "Optimism" - }, "networkNamePolygon": { "message": "Polygon" }, diff --git a/shared/constants/network.ts b/shared/constants/network.ts index db5ca5477740..5c206c1bc789 100644 --- a/shared/constants/network.ts +++ b/shared/constants/network.ts @@ -181,7 +181,7 @@ export const POLYGON_DISPLAY_NAME = 'Polygon'; export const AVALANCHE_DISPLAY_NAME = 'Avalanche Network C-Chain'; export const ARBITRUM_DISPLAY_NAME = 'Arbitrum One'; export const BNB_DISPLAY_NAME = 'BNB Chain'; -export const OPTIMISM_DISPLAY_NAME = 'Optimism'; +export const OPTIMISM_DISPLAY_NAME = 'OP Mainnet'; export const FANTOM_DISPLAY_NAME = 'Fantom Opera'; export const HARMONY_DISPLAY_NAME = 'Harmony Mainnet Shard 0'; export const PALM_DISPLAY_NAME = 'Palm'; diff --git a/ui/pages/swaps/fee-card/fee-card.js b/ui/pages/swaps/fee-card/fee-card.js index 9b2dabd9ca70..748bc8482bc4 100644 --- a/ui/pages/swaps/fee-card/fee-card.js +++ b/ui/pages/swaps/fee-card/fee-card.js @@ -49,7 +49,7 @@ export default function FeeCard({ case CHAIN_IDS.AVALANCHE: return t('networkNameAvalanche'); case CHAIN_IDS.OPTIMISM: - return t('networkNameOptimism'); + return t('networkNameOpMainnet'); case CHAIN_IDS.ARBITRUM: return t('networkNameArbitrum'); case CHAIN_IDS.ZKSYNC_ERA: diff --git a/ui/pages/swaps/prepare-swap-page/review-quote.js b/ui/pages/swaps/prepare-swap-page/review-quote.js index e95364bd70d8..fe52aec9c543 100644 --- a/ui/pages/swaps/prepare-swap-page/review-quote.js +++ b/ui/pages/swaps/prepare-swap-page/review-quote.js @@ -264,7 +264,7 @@ export default function ReviewQuote({ setReceiveToAmount }) { case CHAIN_IDS.AVALANCHE: return t('networkNameAvalanche'); case CHAIN_IDS.OPTIMISM: - return t('networkNameOptimism'); + return t('networkNameOpMainnet'); case CHAIN_IDS.ARBITRUM: return t('networkNameArbitrum'); case CHAIN_IDS.ZKSYNC_ERA: From 4e4f62ba34dadba584c25d9482e9403ae0ddcf1a Mon Sep 17 00:00:00 2001 From: Monte Lai Date: Tue, 10 Oct 2023 04:12:19 +0800 Subject: [PATCH 076/219] Fix: Select snap account after being added (#21267) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This PR fixes the issue where a new Snap account is not selected after creation. ## **Manual testing steps** 1. Go to (https://metamask.github.io/snap-simple-keyring/latest/) 2. Press the `Create account` dropdown and then click `Create Account` 3. On the popup click `Create` 4. On the metamask extension see that the selected account is the new Snap account. ## **Screenshots/Recordings** ### **Before** ![selectsnapaccount1](https://github.com/MetaMask/metamask-extension/assets/96463427/a84d2357-b286-4197-94b1-2d50a209bafd) ### **After** ![select-snap-account2](https://github.com/MetaMask/metamask-extension/assets/96463427/3c5bb4b9-beaa-46db-b9fe-31b4941b3fd6) ## **Related issues** Resolves https://github.com/MetaMask/accounts-planning/issues/99 ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [x] I’ve indicated what issue this PR is linked to: Fixes #??? - [x] I’ve included tests if applicable. - [x] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [x] I’ve properly set the pull request status: - [x] In case it's not yet "ready for review", I've set it to "draft". - [x] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --------- Co-authored-by: Daniel Rocha <68558152+danroc@users.noreply.github.com> --- app/scripts/lib/snap-keyring/snap-keyring.ts | 6 +++++- app/scripts/metamask-controller.js | 2 ++ test/e2e/accounts/test-create-snap-account.spec.js | 9 +++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/scripts/lib/snap-keyring/snap-keyring.ts b/app/scripts/lib/snap-keyring/snap-keyring.ts index a197c2b16690..6d853dfdbf54 100644 --- a/app/scripts/lib/snap-keyring/snap-keyring.ts +++ b/app/scripts/lib/snap-keyring/snap-keyring.ts @@ -8,6 +8,7 @@ import type { KeyringController } from '@metamask/keyring-controller'; import { SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES } from '../../../../shared/constants/app'; import { t } from '../../translate'; import MetamaskController from '../../metamask-controller'; +import PreferencesController from '../../controllers/preferences'; /** * Get the addresses of the accounts managed by a given Snap. @@ -30,6 +31,7 @@ export const getAccountsBySnapId = async ( * @param getSnapController - A function that retrieves the Snap Controller instance. * @param getApprovalController - A function that retrieves the Approval Controller instance. * @param getKeyringController - A function that retrieves the Keyring Controller instance. + * @param getPreferencesController - A function that retrieves the Preferences Controller instance. * @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. @@ -40,6 +42,7 @@ export const snapKeyringBuilder = ( getSnapController: () => SnapController, getApprovalController: () => ApprovalController, getKeyringController: () => KeyringController, + getPreferencesController: () => PreferencesController, removeAccountHelper: (address: string) => Promise, ) => { const builder = (() => { @@ -52,7 +55,7 @@ export const snapKeyringBuilder = ( await getKeyringController().persistAllKeyrings(); }, addAccount: async ( - _address: string, + address: string, origin: string, handleUserInput: (accepted: boolean) => Promise, ) => { @@ -76,6 +79,7 @@ export const snapKeyringBuilder = ( try { await handleUserInput(confirmationResult); await getKeyringController().persistAllKeyrings(); + getPreferencesController().setSelectedAddress(address); await getApprovalController().success({ message: t('snapAccountCreated') ?? 'Your account is ready!', header: [snapAuthorshipHeader], diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 94d12f3de2d1..f80305a3abb8 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -873,12 +873,14 @@ export default class MetamaskController extends EventEmitter { const getSnapController = () => this.snapController; const getApprovalController = () => this.approvalController; const getKeyringController = () => this.keyringController; + const getPreferencesController = () => this.preferencesController; additionalKeyrings.push( snapKeyringBuilder( getSnapController, getApprovalController, getKeyringController, + getPreferencesController, (address) => this.removeAccount(address), ), ); diff --git a/test/e2e/accounts/test-create-snap-account.spec.js b/test/e2e/accounts/test-create-snap-account.spec.js index 1cd8e2d00656..eb4ffdf93a3e 100644 --- a/test/e2e/accounts/test-create-snap-account.spec.js +++ b/test/e2e/accounts/test-create-snap-account.spec.js @@ -177,6 +177,15 @@ describe('Create Snap Account', function () { tag: 'p', text: 'Successful request', }); + + await driver.switchToWindowWithTitle( + WINDOW_TITLES.ExtensionInFullScreenView, + ); + + await driver.findElement({ + css: '[data-testid="account-menu-icon"]', + text: 'Account 2', + }); }, ); }); From 070d64148f8abd814a9f424d8108f07cfea98105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albert=20Oliv=C3=A9?= Date: Tue, 10 Oct 2023 10:27:00 +0200 Subject: [PATCH 077/219] [MMI] Auto-switching to the first custodian wallet when importing accounts (#21253) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** Auto-switching to the first custodian wallet when importing accounts ## **Manual testing steps** 1. When 1 or multiple wallets are imported, the extension should auto-switch to the first wallet in the list after import is completed. ## **Screenshots/Recordings** [Auto-Switching feature - Watch Video](https://www.loom.com/share/517e7dc26c844576956698a7bb872925) ## **Pre-merge author checklist** - [X] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [X] I've clearly explained: - [X] What problem this PR is solving. - [X] How this problem was solved. - [X] How reviewers can test my changes. - [X] I’ve indicated what issue this PR is linked to: Fixes #??? - [X] I’ve included tests if applicable. - [X] I’ve documented any added code. - [X] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [X] I’ve properly set the pull request status: - [X] In case it's not yet "ready for review", I've set it to "draft". - [X] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [X] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [X] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --------- Co-authored-by: Antonio Regadas --- ui/pages/institutional/custody/custody.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/pages/institutional/custody/custody.js b/ui/pages/institutional/custody/custody.js index 8343b41ffcdf..c842b16d801e 100644 --- a/ui/pages/institutional/custody/custody.js +++ b/ui/pages/institutional/custody/custody.js @@ -53,6 +53,7 @@ import { import PulseLoader from '../../../components/ui/pulse-loader/pulse-loader'; import ConfirmConnectCustodianModal from '../confirm-connect-custodian-modal'; import { findCustodianByDisplayName } from '../../../helpers/utils/institutional/find-by-custodian-name'; +import { setSelectedAddress } from '../../../store/actions'; const GK8_DISPLAY_NAME = 'gk8'; @@ -610,6 +611,7 @@ const CustodyPage = () => { const selectedCustodian = custodians.find( (custodian) => custodian.envName === selectedCustodianName, ); + const firstAccountKey = Object.keys(selectedAccounts).shift(); await dispatch( mmiActions.connectCustodyAddresses( @@ -619,6 +621,8 @@ const CustodyPage = () => { ), ); + dispatch(setSelectedAddress(firstAccountKey.toLowerCase())); + trackEvent({ category: MetaMetricsEventCategory.MMI, event: MetaMetricsEventName.CustodialAccountsConnected, From 421b598a7476fd4dfa9d130c6b93f7656ba1a788 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Tue, 10 Oct 2023 10:51:22 +0200 Subject: [PATCH 078/219] Bump snaps packages (#21255) ## **Description** Bump snaps packages to latest. This release adds some under the hood support for a new keyring export. It also adds support for showing SVGs in snaps custom UI. As part of bumping the packages we had to update TypeScript as well. We had a long-standing patch to TypeScript that could be easily replaced with a small patch to LavaMoat to enable `overrideTaming`. This feature is also set to be enabled in the next version of LavaMoat. --- .../lavamoat-core-npm-14.4.1-c4e8bbb016.patch | 13 + .../typescript-npm-4.4.4-3fedcc07a3.patch | 242 ------------------ .../permissions/specifications.test.js | 5 +- builds.yml | 8 +- lavamoat/browserify/beta/policy.json | 51 ++-- lavamoat/browserify/desktop/policy.json | 51 ++-- lavamoat/browserify/flask/policy.json | 51 ++-- lavamoat/browserify/main/policy.json | 51 ++-- lavamoat/browserify/mmi/policy.json | 51 ++-- package.json | 11 +- shared/constants/snaps/permissions.ts | 3 +- .../safe-component-list.js | 2 + .../app/snaps/snap-ui-image/index.ts | 1 + .../app/snaps/snap-ui-image/snap-ui-image.tsx | 11 + .../snap-ui-renderer/snap-ui-renderer.js | 6 + yarn.lock | 173 ++++++++++--- 16 files changed, 356 insertions(+), 374 deletions(-) delete mode 100644 .yarn/patches/typescript-npm-4.4.4-3fedcc07a3.patch create mode 100644 ui/components/app/snaps/snap-ui-image/index.ts create mode 100644 ui/components/app/snaps/snap-ui-image/snap-ui-image.tsx diff --git a/.yarn/patches/lavamoat-core-npm-14.4.1-c4e8bbb016.patch b/.yarn/patches/lavamoat-core-npm-14.4.1-c4e8bbb016.patch index abae9b29583c..07a662583315 100644 --- a/.yarn/patches/lavamoat-core-npm-14.4.1-c4e8bbb016.patch +++ b/.yarn/patches/lavamoat-core-npm-14.4.1-c4e8bbb016.patch @@ -1,3 +1,16 @@ +diff --git a/src/kernelTemplate.js b/src/kernelTemplate.js +index de8d73048b7bb7c4e74009b5c85ad919fe197ef0..e5bcb987cff013def8b2e8c767eb75a57ea0bd7a 100644 +--- a/src/kernelTemplate.js ++++ b/src/kernelTemplate.js +@@ -60,6 +60,8 @@ + errorTaming: 'unsafe', + // shows the full call stack + stackFiltering: 'verbose', ++ // prevents most common override mistake cases from tripping up users ++ overrideTaming: 'severe', + } + + lockdown(lockdownOptions) diff --git a/src/loadPolicy.js b/src/loadPolicy.js index ef71923f9282d6a5e9f74e6ec6fa0516f28f508b..0118fda7e1b0fa461ec01ceff8d7112d072f3dfb 100644 --- a/src/loadPolicy.js diff --git a/.yarn/patches/typescript-npm-4.4.4-3fedcc07a3.patch b/.yarn/patches/typescript-npm-4.4.4-3fedcc07a3.patch deleted file mode 100644 index 95cb488b1435..000000000000 --- a/.yarn/patches/typescript-npm-4.4.4-3fedcc07a3.patch +++ /dev/null @@ -1,242 +0,0 @@ -diff --git a/lib/typescript.js b/lib/typescript.js -index 323de6f4da00612e90e685142120736bfaeed37b..350e352e36f8bb6a870d7c24eaeae6bf7d648840 100644 ---- a/lib/typescript.js -+++ b/lib/typescript.js -@@ -24,11 +24,58 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - return to.concat(ar || Array.prototype.slice.call(from)); - }; - var __assign = (this && this.__assign) || function () { -- __assign = Object.assign || function(t) { -+ __assign = function(t) { - for (var s, i = 1, n = arguments.length; i < n; i++) { - s = arguments[i]; -- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) -- t[p] = s[p]; -+ for (var p in s) { -+ if (Object.prototype.hasOwnProperty.call(s, p)) { -+ /** -+ * In the original version of this package, this was: -+ * -+ * t[p] = s[p] -+ * -+ * Unfortunately LavaMoat trips up on this, so we have to change -+ * it. -+ * -+ * Internally LavaMoat uses `lockdown` (part of SES, which is -+ * part of Endo) to freeze modifications to "intrinsics" — core -+ * things like `Object.prototype`, `Function.prototype`, etc. -+ * This will cause code which is responsible for said -+ * modifications to fail at runtime, because it makes the -+ * properties of these intrinsics non-writable. -+ * -+ * The reason we have to change *this* code is that later on, -+ * this `__assign` function is used to merge two objects, and -+ * one of those objects contains a `constructor` property. As we -+ * know, `constructor` is a special property, as it's a property -+ * on `Object.prototype` that stores the constructor used to -+ * create that object. But when used in this context, there is -+ * nothing inherently special about it – it's just a property on -+ * an object we're setting. Unfortunately, that's not how it's -+ * being treated. Because `lockdown` freezes `Object.prototype`, -+ * `Object.prototype.constructor` is non-writable, and due to a -+ * "mistake" in the ES5 spec [1], that means `constructor` on -+ * *any* object is non-writable too. So an error is thrown when -+ * this code is executed. -+ * -+ * There is a way to get around this, which is to configure -+ * `lockdown` with the option `overrideTaming: 'severe'`. -+ * The mechanics of this option, as well as more information -+ * about the "mistake" this option solves, are explained here -+ * [2]. Unfortunately, we cannot enable this option because -+ * LavaMoat is the one running `lockdown` here [3]. So to work -+ * around this, we use `Object.defineProperty` to define the -+ * property we want. As this does not use property assignment -+ * (`object[key] = value`) but rather defines the property more -+ * directly, this bypasses the "override mistake". -+ * -+ * [1]: https://web.archive.org/web/20141230041441/http://wiki.ecmascript.org/doku.php?id=strawman:fixing_override_mistake -+ * [2]: https://github.com/endojs/endo/blob/864f086f87e1e7ef78a401a7550ff0aeb664bba0/packages/ses/src/enable-property-overrides.js#L28 -+ * [3]: https://github.com/LavaMoat/LavaMoat/blob/7c15bf8ba34ba1a9ceb3ffe591b1b2bfb084bead/packages/core/src/kernelTemplate.js#L32-L43 -+ */ -+ Object.defineProperty(t, p, Object.getOwnPropertyDescriptor(s, p)) -+ } -+ } - } - return t; - }; -@@ -9820,87 +9867,94 @@ var ts; - } - ts.tokenIsIdentifierOrKeywordOrGreaterThan = tokenIsIdentifierOrKeywordOrGreaterThan; - /** @internal */ -- ts.textToKeywordObj = (_a = { -- abstract: 126 /* AbstractKeyword */, -- any: 129 /* AnyKeyword */, -- as: 127 /* AsKeyword */, -- asserts: 128 /* AssertsKeyword */, -- bigint: 156 /* BigIntKeyword */, -- boolean: 132 /* BooleanKeyword */, -- break: 81 /* BreakKeyword */, -- case: 82 /* CaseKeyword */, -- catch: 83 /* CatchKeyword */, -- class: 84 /* ClassKeyword */, -- continue: 86 /* ContinueKeyword */, -- const: 85 /* ConstKeyword */ -- }, -- _a["" + "constructor"] = 133 /* ConstructorKeyword */, -- _a.debugger = 87 /* DebuggerKeyword */, -- _a.declare = 134 /* DeclareKeyword */, -- _a.default = 88 /* DefaultKeyword */, -- _a.delete = 89 /* DeleteKeyword */, -- _a.do = 90 /* DoKeyword */, -- _a.else = 91 /* ElseKeyword */, -- _a.enum = 92 /* EnumKeyword */, -- _a.export = 93 /* ExportKeyword */, -- _a.extends = 94 /* ExtendsKeyword */, -- _a.false = 95 /* FalseKeyword */, -- _a.finally = 96 /* FinallyKeyword */, -- _a.for = 97 /* ForKeyword */, -- _a.from = 154 /* FromKeyword */, -- _a.function = 98 /* FunctionKeyword */, -- _a.get = 135 /* GetKeyword */, -- _a.if = 99 /* IfKeyword */, -- _a.implements = 117 /* ImplementsKeyword */, -- _a.import = 100 /* ImportKeyword */, -- _a.in = 101 /* InKeyword */, -- _a.infer = 136 /* InferKeyword */, -- _a.instanceof = 102 /* InstanceOfKeyword */, -- _a.interface = 118 /* InterfaceKeyword */, -- _a.intrinsic = 137 /* IntrinsicKeyword */, -- _a.is = 138 /* IsKeyword */, -- _a.keyof = 139 /* KeyOfKeyword */, -- _a.let = 119 /* LetKeyword */, -- _a.module = 140 /* ModuleKeyword */, -- _a.namespace = 141 /* NamespaceKeyword */, -- _a.never = 142 /* NeverKeyword */, -- _a.new = 103 /* NewKeyword */, -- _a.null = 104 /* NullKeyword */, -- _a.number = 145 /* NumberKeyword */, -- _a.object = 146 /* ObjectKeyword */, -- _a.package = 120 /* PackageKeyword */, -- _a.private = 121 /* PrivateKeyword */, -- _a.protected = 122 /* ProtectedKeyword */, -- _a.public = 123 /* PublicKeyword */, -- _a.override = 157 /* OverrideKeyword */, -- _a.readonly = 143 /* ReadonlyKeyword */, -- _a.require = 144 /* RequireKeyword */, -- _a.global = 155 /* GlobalKeyword */, -- _a.return = 105 /* ReturnKeyword */, -- _a.set = 147 /* SetKeyword */, -- _a.static = 124 /* StaticKeyword */, -- _a.string = 148 /* StringKeyword */, -- _a.super = 106 /* SuperKeyword */, -- _a.switch = 107 /* SwitchKeyword */, -- _a.symbol = 149 /* SymbolKeyword */, -- _a.this = 108 /* ThisKeyword */, -- _a.throw = 109 /* ThrowKeyword */, -- _a.true = 110 /* TrueKeyword */, -- _a.try = 111 /* TryKeyword */, -- _a.type = 150 /* TypeKeyword */, -- _a.typeof = 112 /* TypeOfKeyword */, -- _a.undefined = 151 /* UndefinedKeyword */, -- _a.unique = 152 /* UniqueKeyword */, -- _a.unknown = 153 /* UnknownKeyword */, -- _a.var = 113 /* VarKeyword */, -- _a.void = 114 /* VoidKeyword */, -- _a.while = 115 /* WhileKeyword */, -- _a.with = 116 /* WithKeyword */, -- _a.yield = 125 /* YieldKeyword */, -- _a.async = 130 /* AsyncKeyword */, -- _a.await = 131 /* AwaitKeyword */, -- _a.of = 158 /* OfKeyword */, -- _a); -+ /** -+ * In the original version of this package, this object was built by -+ * initializing one object and then adding more properties to that object. -+ * This ends up throwing an error when this code is executed due to -+ * the same issue as explained at the top of this file: essentially, -+ * the `constructor` property of any object cannot be set due to the -+ * "override mistake". The fix for this is to just build one big object. -+ */ -+ ts.textToKeywordObj = { -+ abstract: 126 /* AbstractKeyword */, -+ any: 129 /* AnyKeyword */, -+ as: 127 /* AsKeyword */, -+ asserts: 128 /* AssertsKeyword */, -+ bigint: 156 /* BigIntKeyword */, -+ boolean: 132 /* BooleanKeyword */, -+ break: 81 /* BreakKeyword */, -+ case: 82 /* CaseKeyword */, -+ catch: 83 /* CatchKeyword */, -+ class: 84 /* ClassKeyword */, -+ continue: 86 /* ContinueKeyword */, -+ const: 85 /* ConstKeyword */, -+ ["constructor"]: 133 /* ConstructorKeyword */, -+ debugger: 87 /* DebuggerKeyword */, -+ declare: 134 /* DeclareKeyword */, -+ default: 88 /* DefaultKeyword */, -+ delete: 89 /* DeleteKeyword */, -+ do: 90 /* DoKeyword */, -+ else: 91 /* ElseKeyword */, -+ enum: 92 /* EnumKeyword */, -+ export: 93 /* ExportKeyword */, -+ extends: 94 /* ExtendsKeyword */, -+ false: 95 /* FalseKeyword */, -+ finally: 96 /* FinallyKeyword */, -+ for: 97 /* ForKeyword */, -+ from: 154 /* FromKeyword */, -+ function: 98 /* FunctionKeyword */, -+ get: 135 /* GetKeyword */, -+ if: 99 /* IfKeyword */, -+ implements: 117 /* ImplementsKeyword */, -+ import: 100 /* ImportKeyword */, -+ in: 101 /* InKeyword */, -+ infer: 136 /* InferKeyword */, -+ instanceof: 102 /* InstanceOfKeyword */, -+ interface: 118 /* InterfaceKeyword */, -+ intrinsic: 137 /* IntrinsicKeyword */, -+ is: 138 /* IsKeyword */, -+ keyof: 139 /* KeyOfKeyword */, -+ let: 119 /* LetKeyword */, -+ module: 140 /* ModuleKeyword */, -+ namespace: 141 /* NamespaceKeyword */, -+ never: 142 /* NeverKeyword */, -+ new: 103 /* NewKeyword */, -+ null: 104 /* NullKeyword */, -+ number: 145 /* NumberKeyword */, -+ object: 146 /* ObjectKeyword */, -+ package: 120 /* PackageKeyword */, -+ private: 121 /* PrivateKeyword */, -+ protected: 122 /* ProtectedKeyword */, -+ public: 123 /* PublicKeyword */, -+ override: 157 /* OverrideKeyword */, -+ readonly: 143 /* ReadonlyKeyword */, -+ require: 144 /* RequireKeyword */, -+ global: 155 /* GlobalKeyword */, -+ return: 105 /* ReturnKeyword */, -+ set: 147 /* SetKeyword */, -+ static: 124 /* StaticKeyword */, -+ string: 148 /* StringKeyword */, -+ super: 106 /* SuperKeyword */, -+ switch: 107 /* SwitchKeyword */, -+ symbol: 149 /* SymbolKeyword */, -+ this: 108 /* ThisKeyword */, -+ throw: 109 /* ThrowKeyword */, -+ true: 110 /* TrueKeyword */, -+ try: 111 /* TryKeyword */, -+ type: 150 /* TypeKeyword */, -+ typeof: 112 /* TypeOfKeyword */, -+ undefined: 151 /* UndefinedKeyword */, -+ unique: 152 /* UniqueKeyword */, -+ unknown: 153 /* UnknownKeyword */, -+ var: 113 /* VarKeyword */, -+ void: 114 /* VoidKeyword */, -+ while: 115 /* WhileKeyword */, -+ with: 116 /* WithKeyword */, -+ yield: 125 /* YieldKeyword */, -+ async: 130 /* AsyncKeyword */, -+ await: 131 /* AwaitKeyword */, -+ of: 158 /* OfKeyword */ -+ }; - var textToKeyword = new ts.Map(ts.getEntries(ts.textToKeywordObj)); - var textToToken = new ts.Map(ts.getEntries(__assign(__assign({}, ts.textToKeywordObj), { "{": 18 /* OpenBraceToken */, "}": 19 /* CloseBraceToken */, "(": 20 /* OpenParenToken */, ")": 21 /* CloseParenToken */, "[": 22 /* OpenBracketToken */, "]": 23 /* CloseBracketToken */, ".": 24 /* DotToken */, "...": 25 /* DotDotDotToken */, ";": 26 /* SemicolonToken */, ",": 27 /* CommaToken */, "<": 29 /* LessThanToken */, ">": 31 /* GreaterThanToken */, "<=": 32 /* LessThanEqualsToken */, ">=": 33 /* GreaterThanEqualsToken */, "==": 34 /* EqualsEqualsToken */, "!=": 35 /* ExclamationEqualsToken */, "===": 36 /* EqualsEqualsEqualsToken */, "!==": 37 /* ExclamationEqualsEqualsToken */, "=>": 38 /* EqualsGreaterThanToken */, "+": 39 /* PlusToken */, "-": 40 /* MinusToken */, "**": 42 /* AsteriskAsteriskToken */, "*": 41 /* AsteriskToken */, "/": 43 /* SlashToken */, "%": 44 /* PercentToken */, "++": 45 /* PlusPlusToken */, "--": 46 /* MinusMinusToken */, "<<": 47 /* LessThanLessThanToken */, ">": 48 /* GreaterThanGreaterThanToken */, ">>>": 49 /* GreaterThanGreaterThanGreaterThanToken */, "&": 50 /* AmpersandToken */, "|": 51 /* BarToken */, "^": 52 /* CaretToken */, "!": 53 /* ExclamationToken */, "~": 54 /* TildeToken */, "&&": 55 /* AmpersandAmpersandToken */, "||": 56 /* BarBarToken */, "?": 57 /* QuestionToken */, "??": 60 /* QuestionQuestionToken */, "?.": 28 /* QuestionDotToken */, ":": 58 /* ColonToken */, "=": 63 /* EqualsToken */, "+=": 64 /* PlusEqualsToken */, "-=": 65 /* MinusEqualsToken */, "*=": 66 /* AsteriskEqualsToken */, "**=": 67 /* AsteriskAsteriskEqualsToken */, "/=": 68 /* SlashEqualsToken */, "%=": 69 /* PercentEqualsToken */, "<<=": 70 /* LessThanLessThanEqualsToken */, ">>=": 71 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 72 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 73 /* AmpersandEqualsToken */, "|=": 74 /* BarEqualsToken */, "^=": 78 /* CaretEqualsToken */, "||=": 75 /* BarBarEqualsToken */, "&&=": 76 /* AmpersandAmpersandEqualsToken */, "??=": 77 /* QuestionQuestionEqualsToken */, "@": 59 /* AtToken */, "#": 62 /* HashToken */, "`": 61 /* BacktickToken */ }))); - /* diff --git a/app/scripts/controllers/permissions/specifications.test.js b/app/scripts/controllers/permissions/specifications.test.js index 892ee3cadaec..eb64a6a4c7cf 100644 --- a/app/scripts/controllers/permissions/specifications.test.js +++ b/app/scripts/controllers/permissions/specifications.test.js @@ -16,7 +16,7 @@ describe('PermissionController specifications', () => { describe('caveat specifications', () => { it('getCaveatSpecifications returns the expected specifications object', () => { const caveatSpecifications = getCaveatSpecifications({}); - expect(Object.keys(caveatSpecifications)).toHaveLength(8); + expect(Object.keys(caveatSpecifications)).toHaveLength(9); expect( caveatSpecifications[CaveatTypes.restrictReturnedAccounts].type, ).toStrictEqual(CaveatTypes.restrictReturnedAccounts); @@ -42,6 +42,9 @@ describe('PermissionController specifications', () => { expect(caveatSpecifications.snapIds.type).toStrictEqual( SnapCaveatType.SnapIds, ); + expect(caveatSpecifications.keyringOrigin.type).toStrictEqual( + SnapCaveatType.KeyringOrigin, + ); }); describe('restrictReturnedAccounts', () => { diff --git a/builds.yml b/builds.yml index a873ae851377..6259e41c2375 100644 --- a/builds.yml +++ b/builds.yml @@ -25,7 +25,7 @@ buildTypes: - SEGMENT_WRITE_KEY_REF: SEGMENT_PROD_WRITE_KEY - ALLOW_LOCAL_SNAPS: false - REQUIRE_SNAPS_ALLOWLIST: true - - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/2.0.1/index.html + - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/3.0.0/index.html - KEYRING_SNAPS_REGISTRY_URL: https://metamask.github.io/keyring-snaps-registry/prod/registry.json # Main build uses the default browser manifest manifestOverrides: false @@ -59,7 +59,7 @@ buildTypes: - SEGMENT_FLASK_WRITE_KEY - ALLOW_LOCAL_SNAPS: true - REQUIRE_SNAPS_ALLOWLIST: false - - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/2.0.1/index.html + - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/3.0.0/index.html - SUPPORT_LINK: https://metamask-flask.zendesk.com/hc - SUPPORT_REQUEST_LINK: https://metamask-flask.zendesk.com/hc/en-us/requests/new - INFURA_ENV_KEY_REF: INFURA_FLASK_PROJECT_ID @@ -79,7 +79,7 @@ buildTypes: - SEGMENT_FLASK_WRITE_KEY - ALLOW_LOCAL_SNAPS: true - REQUIRE_SNAPS_ALLOWLIST: false - - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/2.0.1/index.html + - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/3.0.0/index.html - SUPPORT_LINK: https://metamask-flask.zendesk.com/hc - SUPPORT_REQUEST_LINK: https://metamask-flask.zendesk.com/hc/en-us/requests/new - INFURA_ENV_KEY_REF: INFURA_FLASK_PROJECT_ID @@ -99,7 +99,7 @@ buildTypes: - SEGMENT_WRITE_KEY_REF: SEGMENT_MMI_WRITE_KEY - ALLOW_LOCAL_SNAPS: false - REQUIRE_SNAPS_ALLOWLIST: true - - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/2.0.1/index.html + - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/3.0.0/index.html - MMI_CONFIGURATION_SERVICE_URL: https://configuration.metamask-institutional.io/v2/configuration/default - SUPPORT_LINK: https://mmi-support.zendesk.com/hc/en-us - SUPPORT_REQUEST_LINK: https://mmi-support.zendesk.com/hc/en-us/requests/new diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index da7437131ab9..590597b964ba 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -1884,7 +1884,7 @@ }, "packages": { "@metamask/base-controller": true, - "@metamask/controller-utils": true, + "@metamask/permission-controller>@metamask/controller-utils": true, "@metamask/permission-controller>@metamask/utils": true, "@metamask/permission-controller>nanoid": true, "deep-freeze-strict": true, @@ -1893,6 +1893,23 @@ "json-rpc-engine": true } }, + "@metamask/permission-controller>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/permission-controller>@metamask/utils": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true, + "ethereumjs-util": true, + "ethjs>ethjs-unit": true + } + }, "@metamask/permission-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2076,6 +2093,7 @@ "@metamask/snaps-ui": { "packages": { "@metamask/snaps-ui>@metamask/utils": true, + "@metamask/snaps-ui>is-svg": true, "superstruct": true } }, @@ -2092,6 +2110,20 @@ "superstruct": true } }, + "@metamask/snaps-ui>is-svg": { + "packages": { + "@metamask/snaps-ui>is-svg>fast-xml-parser": true + } + }, + "@metamask/snaps-ui>is-svg>fast-xml-parser": { + "globals": { + "entityName": true, + "val": true + }, + "packages": { + "@metamask/snaps-ui>is-svg>fast-xml-parser>strnum": true + } + }, "@metamask/snaps-utils": { "globals": { "TextDecoder": true, @@ -2106,10 +2138,11 @@ "@metamask/key-tree": true, "@metamask/key-tree>@noble/hashes": true, "@metamask/key-tree>@scure/base": true, + "@metamask/permission-controller": true, + "@metamask/snaps-ui>is-svg": true, "@metamask/snaps-utils>@metamask/utils": true, "@metamask/snaps-utils>cron-parser": true, "@metamask/snaps-utils>fast-json-stable-stringify": true, - "@metamask/snaps-utils>is-svg": true, "@metamask/snaps-utils>rfdc": true, "@metamask/snaps-utils>validate-npm-package-name": true, "browserify>buffer": true, @@ -2139,20 +2172,6 @@ "luxon": true } }, - "@metamask/snaps-utils>is-svg": { - "packages": { - "@metamask/snaps-utils>is-svg>fast-xml-parser": true - } - }, - "@metamask/snaps-utils>is-svg>fast-xml-parser": { - "globals": { - "entityName": true, - "val": true - }, - "packages": { - "@metamask/snaps-utils>is-svg>fast-xml-parser>strnum": true - } - }, "@metamask/snaps-utils>rfdc": { "packages": { "browserify>buffer": true diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json index 0f9d838025b1..6889e6544be7 100644 --- a/lavamoat/browserify/desktop/policy.json +++ b/lavamoat/browserify/desktop/policy.json @@ -2032,7 +2032,7 @@ }, "packages": { "@metamask/base-controller": true, - "@metamask/controller-utils": true, + "@metamask/permission-controller>@metamask/controller-utils": true, "@metamask/permission-controller>@metamask/utils": true, "@metamask/permission-controller>nanoid": true, "deep-freeze-strict": true, @@ -2041,6 +2041,23 @@ "json-rpc-engine": true } }, + "@metamask/permission-controller>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/permission-controller>@metamask/utils": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true, + "ethereumjs-util": true, + "ethjs>ethjs-unit": true + } + }, "@metamask/permission-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2458,6 +2475,7 @@ "@metamask/snaps-ui": { "packages": { "@metamask/snaps-ui>@metamask/utils": true, + "@metamask/snaps-ui>is-svg": true, "superstruct": true } }, @@ -2474,6 +2492,20 @@ "superstruct": true } }, + "@metamask/snaps-ui>is-svg": { + "packages": { + "@metamask/snaps-ui>is-svg>fast-xml-parser": true + } + }, + "@metamask/snaps-ui>is-svg>fast-xml-parser": { + "globals": { + "entityName": true, + "val": true + }, + "packages": { + "@metamask/snaps-ui>is-svg>fast-xml-parser>strnum": true + } + }, "@metamask/snaps-utils": { "globals": { "TextDecoder": true, @@ -2488,10 +2520,11 @@ "@metamask/key-tree": true, "@metamask/key-tree>@noble/hashes": true, "@metamask/key-tree>@scure/base": true, + "@metamask/permission-controller": true, + "@metamask/snaps-ui>is-svg": true, "@metamask/snaps-utils>@metamask/utils": true, "@metamask/snaps-utils>cron-parser": true, "@metamask/snaps-utils>fast-json-stable-stringify": true, - "@metamask/snaps-utils>is-svg": true, "@metamask/snaps-utils>rfdc": true, "@metamask/snaps-utils>validate-npm-package-name": true, "browserify>buffer": true, @@ -2541,20 +2574,6 @@ "luxon": true } }, - "@metamask/snaps-utils>is-svg": { - "packages": { - "@metamask/snaps-utils>is-svg>fast-xml-parser": true - } - }, - "@metamask/snaps-utils>is-svg>fast-xml-parser": { - "globals": { - "entityName": true, - "val": true - }, - "packages": { - "@metamask/snaps-utils>is-svg>fast-xml-parser>strnum": true - } - }, "@metamask/snaps-utils>rfdc": { "packages": { "browserify>buffer": true diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 8fb9de1d7c20..7423db0e7c24 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -2032,7 +2032,7 @@ }, "packages": { "@metamask/base-controller": true, - "@metamask/controller-utils": true, + "@metamask/permission-controller>@metamask/controller-utils": true, "@metamask/permission-controller>@metamask/utils": true, "@metamask/permission-controller>nanoid": true, "deep-freeze-strict": true, @@ -2041,6 +2041,23 @@ "json-rpc-engine": true } }, + "@metamask/permission-controller>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/permission-controller>@metamask/utils": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true, + "ethereumjs-util": true, + "ethjs>ethjs-unit": true + } + }, "@metamask/permission-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2474,6 +2491,7 @@ "@metamask/snaps-ui": { "packages": { "@metamask/snaps-ui>@metamask/utils": true, + "@metamask/snaps-ui>is-svg": true, "superstruct": true } }, @@ -2490,6 +2508,20 @@ "superstruct": true } }, + "@metamask/snaps-ui>is-svg": { + "packages": { + "@metamask/snaps-ui>is-svg>fast-xml-parser": true + } + }, + "@metamask/snaps-ui>is-svg>fast-xml-parser": { + "globals": { + "entityName": true, + "val": true + }, + "packages": { + "@metamask/snaps-ui>is-svg>fast-xml-parser>strnum": true + } + }, "@metamask/snaps-utils": { "globals": { "TextDecoder": true, @@ -2504,10 +2536,11 @@ "@metamask/key-tree": true, "@metamask/key-tree>@noble/hashes": true, "@metamask/key-tree>@scure/base": true, + "@metamask/permission-controller": true, + "@metamask/snaps-ui>is-svg": true, "@metamask/snaps-utils>@metamask/utils": true, "@metamask/snaps-utils>cron-parser": true, "@metamask/snaps-utils>fast-json-stable-stringify": true, - "@metamask/snaps-utils>is-svg": true, "@metamask/snaps-utils>rfdc": true, "@metamask/snaps-utils>validate-npm-package-name": true, "browserify>buffer": true, @@ -2557,20 +2590,6 @@ "luxon": true } }, - "@metamask/snaps-utils>is-svg": { - "packages": { - "@metamask/snaps-utils>is-svg>fast-xml-parser": true - } - }, - "@metamask/snaps-utils>is-svg>fast-xml-parser": { - "globals": { - "entityName": true, - "val": true - }, - "packages": { - "@metamask/snaps-utils>is-svg>fast-xml-parser>strnum": true - } - }, "@metamask/snaps-utils>rfdc": { "packages": { "browserify>buffer": true diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 28e8a7593919..91343fef0725 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -1891,7 +1891,7 @@ }, "packages": { "@metamask/base-controller": true, - "@metamask/controller-utils": true, + "@metamask/permission-controller>@metamask/controller-utils": true, "@metamask/permission-controller>@metamask/utils": true, "@metamask/permission-controller>nanoid": true, "deep-freeze-strict": true, @@ -1900,6 +1900,23 @@ "json-rpc-engine": true } }, + "@metamask/permission-controller>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/permission-controller>@metamask/utils": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true, + "ethereumjs-util": true, + "ethjs>ethjs-unit": true + } + }, "@metamask/permission-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2317,6 +2334,7 @@ "@metamask/snaps-ui": { "packages": { "@metamask/snaps-ui>@metamask/utils": true, + "@metamask/snaps-ui>is-svg": true, "superstruct": true } }, @@ -2333,6 +2351,20 @@ "superstruct": true } }, + "@metamask/snaps-ui>is-svg": { + "packages": { + "@metamask/snaps-ui>is-svg>fast-xml-parser": true + } + }, + "@metamask/snaps-ui>is-svg>fast-xml-parser": { + "globals": { + "entityName": true, + "val": true + }, + "packages": { + "@metamask/snaps-ui>is-svg>fast-xml-parser>strnum": true + } + }, "@metamask/snaps-utils": { "globals": { "TextDecoder": true, @@ -2347,10 +2379,11 @@ "@metamask/key-tree": true, "@metamask/key-tree>@noble/hashes": true, "@metamask/key-tree>@scure/base": true, + "@metamask/permission-controller": true, + "@metamask/snaps-ui>is-svg": true, "@metamask/snaps-utils>@metamask/utils": true, "@metamask/snaps-utils>cron-parser": true, "@metamask/snaps-utils>fast-json-stable-stringify": true, - "@metamask/snaps-utils>is-svg": true, "@metamask/snaps-utils>rfdc": true, "@metamask/snaps-utils>validate-npm-package-name": true, "browserify>buffer": true, @@ -2400,20 +2433,6 @@ "luxon": true } }, - "@metamask/snaps-utils>is-svg": { - "packages": { - "@metamask/snaps-utils>is-svg>fast-xml-parser": true - } - }, - "@metamask/snaps-utils>is-svg>fast-xml-parser": { - "globals": { - "entityName": true, - "val": true - }, - "packages": { - "@metamask/snaps-utils>is-svg>fast-xml-parser>strnum": true - } - }, "@metamask/snaps-utils>rfdc": { "packages": { "browserify>buffer": true diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index 76a4437d69f6..3aac76af33d7 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -2031,7 +2031,7 @@ }, "packages": { "@metamask/base-controller": true, - "@metamask/controller-utils": true, + "@metamask/permission-controller>@metamask/controller-utils": true, "@metamask/permission-controller>@metamask/utils": true, "@metamask/permission-controller>nanoid": true, "deep-freeze-strict": true, @@ -2040,6 +2040,23 @@ "json-rpc-engine": true } }, + "@metamask/permission-controller>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/permission-controller>@metamask/utils": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true, + "ethereumjs-util": true, + "ethjs>ethjs-unit": true + } + }, "@metamask/permission-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2457,6 +2474,7 @@ "@metamask/snaps-ui": { "packages": { "@metamask/snaps-ui>@metamask/utils": true, + "@metamask/snaps-ui>is-svg": true, "superstruct": true } }, @@ -2473,6 +2491,20 @@ "superstruct": true } }, + "@metamask/snaps-ui>is-svg": { + "packages": { + "@metamask/snaps-ui>is-svg>fast-xml-parser": true + } + }, + "@metamask/snaps-ui>is-svg>fast-xml-parser": { + "globals": { + "entityName": true, + "val": true + }, + "packages": { + "@metamask/snaps-ui>is-svg>fast-xml-parser>strnum": true + } + }, "@metamask/snaps-utils": { "globals": { "TextDecoder": true, @@ -2487,10 +2519,11 @@ "@metamask/key-tree": true, "@metamask/key-tree>@noble/hashes": true, "@metamask/key-tree>@scure/base": true, + "@metamask/permission-controller": true, + "@metamask/snaps-ui>is-svg": true, "@metamask/snaps-utils>@metamask/utils": true, "@metamask/snaps-utils>cron-parser": true, "@metamask/snaps-utils>fast-json-stable-stringify": true, - "@metamask/snaps-utils>is-svg": true, "@metamask/snaps-utils>rfdc": true, "@metamask/snaps-utils>validate-npm-package-name": true, "browserify>buffer": true, @@ -2540,20 +2573,6 @@ "luxon": true } }, - "@metamask/snaps-utils>is-svg": { - "packages": { - "@metamask/snaps-utils>is-svg>fast-xml-parser": true - } - }, - "@metamask/snaps-utils>is-svg>fast-xml-parser": { - "globals": { - "entityName": true, - "val": true - }, - "packages": { - "@metamask/snaps-utils>is-svg>fast-xml-parser>strnum": true - } - }, "@metamask/snaps-utils>rfdc": { "packages": { "browserify>buffer": true diff --git a/package.json b/package.json index 5a3782722d94..65451f5b7981 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,6 @@ "ast-types": "^0.14.2", "x-default-browser": "^0.5.2", "web3-provider-engine/eth-json-rpc-filters": "^6.0.0", - "typescript@~4.4.0": "patch:typescript@npm:4.4.4#.yarn/patches/typescript-npm-4.4.4-3fedcc07a3.patch", "acorn@^7.0.0": "patch:acorn@npm:7.4.1#.yarn/patches/acorn-npm-7.4.1-f450b4646c.patch", "acorn@^7.4.1": "patch:acorn@npm:7.4.1#.yarn/patches/acorn-npm-7.4.1-f450b4646c.patch", "acorn@^7.1.1": "patch:acorn@npm:7.4.1#.yarn/patches/acorn-npm-7.4.1-f450b4646c.patch", @@ -271,16 +270,16 @@ "@metamask/ppom-validator": "^0.5.0", "@metamask/providers": "^13.0.0", "@metamask/rate-limit-controller": "^3.0.0", - "@metamask/rpc-methods": "^2.0.0", + "@metamask/rpc-methods": "^3.0.0", "@metamask/safe-event-emitter": "^2.0.0", "@metamask/scure-bip39": "^2.0.3", "@metamask/selected-network-controller": "^1.0.0", "@metamask/signature-controller": "^6.0.0", "@metamask/slip44": "^3.0.0", "@metamask/smart-transactions-controller": "^4.0.0", - "@metamask/snaps-controllers": "^2.0.2", - "@metamask/snaps-ui": "^2.0.0", - "@metamask/snaps-utils": "^2.0.1", + "@metamask/snaps-controllers": "^3.0.0", + "@metamask/snaps-ui": "^3.0.0", + "@metamask/snaps-utils": "^3.0.0", "@metamask/utils": "^5.0.0", "@ngraveio/bc-ur": "^1.1.6", "@popperjs/core": "^2.4.0", @@ -548,7 +547,7 @@ "through2": "^4.0.2", "ts-node": "^10.5.0", "ttest": "^2.1.1", - "typescript": "~4.4.0", + "typescript": "~4.5.0", "vinyl": "^2.2.1", "vinyl-buffer": "^1.0.1", "vinyl-source-stream": "^2.0.0", diff --git a/shared/constants/snaps/permissions.ts b/shared/constants/snaps/permissions.ts index 26d1f8ee9417..47971ad511cf 100644 --- a/shared/constants/snaps/permissions.ts +++ b/shared/constants/snaps/permissions.ts @@ -25,9 +25,10 @@ export const ExcludedSnapPermissions = Object.freeze({ }); export const ExcludedSnapEndowments = Object.freeze({ - ///: BEGIN:ONLY_INCLUDE_IN(build-main) + // Move to below fence once implemented 'endowment:keyring': 'This endowment is still in development therefore not available.', + ///: BEGIN:ONLY_INCLUDE_IN(build-main) 'endowment:lifecycle-hooks': 'This endowment is experimental and therefore not available.', 'endowment:name-lookup': diff --git a/ui/components/app/metamask-template-renderer/safe-component-list.js b/ui/components/app/metamask-template-renderer/safe-component-list.js index 513a0520e544..0c6574f71190 100644 --- a/ui/components/app/metamask-template-renderer/safe-component-list.js +++ b/ui/components/app/metamask-template-renderer/safe-component-list.js @@ -19,6 +19,7 @@ import { SnapDelineator } from '../snaps/snap-delineator'; import { Copyable } from '../snaps/copyable'; import Spinner from '../../ui/spinner'; import { SnapUIMarkdown } from '../snaps/snap-ui-markdown'; +import { SnapUIImage } from '../snaps/snap-ui-image'; ///: END:ONLY_INCLUDE_IN ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) import { CreateSnapAccount } from '../../../pages/create-snap-account'; @@ -53,6 +54,7 @@ export const safeComponentList = { Copyable, SnapDelineator, SnapUIMarkdown, + SnapUIImage, Spinner, ///: END:ONLY_INCLUDE_IN ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) diff --git a/ui/components/app/snaps/snap-ui-image/index.ts b/ui/components/app/snaps/snap-ui-image/index.ts new file mode 100644 index 000000000000..3b406c53ff97 --- /dev/null +++ b/ui/components/app/snaps/snap-ui-image/index.ts @@ -0,0 +1 @@ +export * from './snap-ui-image'; diff --git a/ui/components/app/snaps/snap-ui-image/snap-ui-image.tsx b/ui/components/app/snaps/snap-ui-image/snap-ui-image.tsx new file mode 100644 index 000000000000..ee5773f05ccd --- /dev/null +++ b/ui/components/app/snaps/snap-ui-image/snap-ui-image.tsx @@ -0,0 +1,11 @@ +import React from 'react'; + +export type SnapUIImageProps = { + value: string; +}; + +export const SnapUIImage = ({ value }: SnapUIImageProps) => { + const src = `data:image/svg+xml;utf8,${encodeURIComponent(value)}`; + + return ; +}; diff --git a/ui/components/app/snaps/snap-ui-renderer/snap-ui-renderer.js b/ui/components/app/snaps/snap-ui-renderer/snap-ui-renderer.js index 82a9a1c2f1aa..d6fd82e08653 100644 --- a/ui/components/app/snaps/snap-ui-renderer/snap-ui-renderer.js +++ b/ui/components/app/snaps/snap-ui-renderer/snap-ui-renderer.js @@ -71,6 +71,12 @@ export const UI_MAPPING = { text: props.value, }, }), + image: (props) => ({ + element: 'SnapUIImage', + props: { + value: props.value, + }, + }), }; // TODO: Stop exporting this when we remove the mapToTemplate hack in confirmation templates. diff --git a/yarn.lock b/yarn.lock index 6331cf6ce069..e31fcc00c12a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4485,13 +4485,13 @@ __metadata: languageName: node linkType: hard -"@metamask/permission-controller@npm:^4.0.0, @metamask/permission-controller@npm:^4.1.0": - version: 4.1.1 - resolution: "@metamask/permission-controller@npm:4.1.1" +"@metamask/permission-controller@npm:^4.0.0, @metamask/permission-controller@npm:^4.1.0, @metamask/permission-controller@npm:^4.1.2": + version: 4.1.2 + resolution: "@metamask/permission-controller@npm:4.1.2" dependencies: - "@metamask/approval-controller": "npm:^3.5.1" - "@metamask/base-controller": "npm:^3.2.1" - "@metamask/controller-utils": "npm:^4.3.2" + "@metamask/approval-controller": "npm:^3.5.2" + "@metamask/base-controller": "npm:^3.2.2" + "@metamask/controller-utils": "npm:^5.0.1" "@metamask/utils": "npm:^6.2.0" "@types/deep-freeze-strict": "npm:^1.1.0" deep-freeze-strict: "npm:^1.1.1" @@ -4500,8 +4500,8 @@ __metadata: json-rpc-engine: "npm:^6.1.0" nanoid: "npm:^3.1.31" peerDependencies: - "@metamask/approval-controller": ^3.5.1 - checksum: 5e0d05ff1d56a9a58e031806528e6f7963227d5405ffd9c4df9623fc79ecaa703e26199066bdc77ec33e35abc25e2589d059b79f131d95e47c5e936991fdb817 + "@metamask/approval-controller": ^3.5.2 + checksum: 36cf5bfc5ae03ca2df74d03c6d3f2139c18eacf7ef5b15eb20b208db6ed906ebcc7c268de45fffe5374fa7ce79ebd94c87e1db7f96bfa20fcfb2c3cd4be27ba4 languageName: node linkType: hard @@ -4664,6 +4664,23 @@ __metadata: languageName: node linkType: hard +"@metamask/rpc-methods@npm:^3.0.0": + version: 3.0.0 + resolution: "@metamask/rpc-methods@npm:3.0.0" + dependencies: + "@metamask/key-tree": "npm:^9.0.0" + "@metamask/permission-controller": "npm:^4.1.2" + "@metamask/snaps-ui": "npm:^3.0.0" + "@metamask/snaps-utils": "npm:^3.0.0" + "@metamask/types": "npm:^1.1.0" + "@metamask/utils": "npm:^8.1.0" + "@noble/hashes": "npm:^1.3.1" + eth-rpc-errors: "npm:^4.0.3" + superstruct: "npm:^1.0.3" + checksum: ddb4ae86216db0012ffd5d6d81f0e2255be9b4b51b2dee31e0db0006dc3b6f08079bc1c4bfe852b57058a1b1278257fc637e29b919916c7245d57e3b89a0d4c4 + languageName: node + linkType: hard + "@metamask/safe-event-emitter@npm:^2.0.0": version: 2.0.0 resolution: "@metamask/safe-event-emitter@npm:2.0.0" @@ -4763,7 +4780,7 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-controllers@npm:^2.0.0, @metamask/snaps-controllers@npm:^2.0.2": +"@metamask/snaps-controllers@npm:^2.0.0": version: 2.0.2 resolution: "@metamask/snaps-controllers@npm:2.0.2" dependencies: @@ -4791,6 +4808,34 @@ __metadata: languageName: node linkType: hard +"@metamask/snaps-controllers@npm:^3.0.0": + version: 3.0.0 + resolution: "@metamask/snaps-controllers@npm:3.0.0" + dependencies: + "@metamask/approval-controller": "npm:^3.5.0" + "@metamask/base-controller": "npm:^3.2.0" + "@metamask/object-multiplex": "npm:^1.2.0" + "@metamask/permission-controller": "npm:^4.1.2" + "@metamask/post-message-stream": "npm:^7.0.0" + "@metamask/rpc-methods": "npm:^3.0.0" + "@metamask/snaps-execution-environments": "npm:^3.0.0" + "@metamask/snaps-registry": "npm:^2.0.0" + "@metamask/snaps-utils": "npm:^3.0.0" + "@metamask/utils": "npm:^8.1.0" + "@xstate/fsm": "npm:^2.0.0" + concat-stream: "npm:^2.0.0" + eth-rpc-errors: "npm:^4.0.3" + gunzip-maybe: "npm:^1.4.2" + immer: "npm:^9.0.6" + json-rpc-engine: "npm:^6.1.0" + json-rpc-middleware-stream: "npm:^4.2.0" + nanoid: "npm:^3.1.31" + readable-web-to-node-stream: "npm:^3.0.2" + tar-stream: "npm:^2.2.0" + checksum: 80a724a41dd17b4df4c8fb75eb987f03f2c787837707f3341fdafd78b678112198fc14c4e01397dca91a1c2c479cc4dea1cb4a7d0da53aaca628fd64530bdc22 + languageName: node + linkType: hard + "@metamask/snaps-execution-environments@npm:^2.0.1": version: 2.0.1 resolution: "@metamask/snaps-execution-environments@npm:2.0.1" @@ -4809,6 +4854,24 @@ __metadata: languageName: node linkType: hard +"@metamask/snaps-execution-environments@npm:^3.0.0": + version: 3.0.0 + resolution: "@metamask/snaps-execution-environments@npm:3.0.0" + dependencies: + "@metamask/object-multiplex": "npm:^1.2.0" + "@metamask/post-message-stream": "npm:^7.0.0" + "@metamask/providers": "npm:^11.1.1" + "@metamask/rpc-methods": "npm:^3.0.0" + "@metamask/snaps-utils": "npm:^3.0.0" + "@metamask/utils": "npm:^8.1.0" + eth-rpc-errors: "npm:^4.0.3" + json-rpc-engine: "npm:^6.1.0" + nanoid: "npm:^3.1.31" + superstruct: "npm:^1.0.3" + checksum: 151c4b9da478ba48b48301bb50fe553efa981b215885bd7d59365b266c0e333a95142b4abb7084d9aae7f085bfbbe2bca5edfb3b546e9615fee33b7edb0487a2 + languageName: node + linkType: hard + "@metamask/snaps-registry@npm:^2.0.0": version: 2.0.0 resolution: "@metamask/snaps-registry@npm:2.0.0" @@ -4830,6 +4893,17 @@ __metadata: languageName: node linkType: hard +"@metamask/snaps-ui@npm:^3.0.0": + version: 3.0.0 + resolution: "@metamask/snaps-ui@npm:3.0.0" + dependencies: + "@metamask/utils": "npm:^8.1.0" + is-svg: "npm:^4.4.0" + superstruct: "npm:^1.0.3" + checksum: 4d5364bbd3ae80389ac03a570b51a40ed9f93b18ad539c3609c7c2b6753ce0b7c7a64b98ad99fc5d1e623fbd88a4c3993811a89683a5f7769951e0f5d479de81 + languageName: node + linkType: hard + "@metamask/snaps-utils@npm:^2.0.0, @metamask/snaps-utils@npm:^2.0.1": version: 2.0.1 resolution: "@metamask/snaps-utils@npm:2.0.1" @@ -4859,6 +4933,35 @@ __metadata: languageName: node linkType: hard +"@metamask/snaps-utils@npm:^3.0.0": + version: 3.0.0 + resolution: "@metamask/snaps-utils@npm:3.0.0" + dependencies: + "@babel/core": "npm:^7.20.12" + "@babel/types": "npm:^7.18.7" + "@metamask/base-controller": "npm:^3.2.0" + "@metamask/key-tree": "npm:^9.0.0" + "@metamask/permission-controller": "npm:^4.1.2" + "@metamask/snaps-registry": "npm:^2.0.0" + "@metamask/snaps-ui": "npm:^3.0.0" + "@metamask/utils": "npm:^8.1.0" + "@noble/hashes": "npm:^1.3.1" + "@scure/base": "npm:^1.1.1" + chalk: "npm:^4.1.2" + cron-parser: "npm:^4.5.0" + eth-rpc-errors: "npm:^4.0.3" + fast-deep-equal: "npm:^3.1.3" + fast-json-stable-stringify: "npm:^2.1.0" + is-svg: "npm:^4.4.0" + rfdc: "npm:^1.3.0" + semver: "npm:^7.5.4" + ses: "npm:^0.18.8" + superstruct: "npm:^1.0.3" + validate-npm-package-name: "npm:^5.0.0" + checksum: 576946daf63177a3c7d780847aff56ea87f2ef0f441ea2114976562838bf4a9ffb6e374e5a3587268df936b5f524300f7a5ef08ad3ff8ebee2fd228e999a827e + languageName: node + linkType: hard + "@metamask/swappable-obj-proxy@npm:^2.1.0": version: 2.1.0 resolution: "@metamask/swappable-obj-proxy@npm:2.1.0" @@ -22512,12 +22615,12 @@ __metadata: "lavamoat-core@patch:lavamoat-core@npm%3A14.4.1#~/.yarn/patches/lavamoat-core-npm-14.4.1-c4e8bbb016.patch": version: 14.4.1 - resolution: "lavamoat-core@patch:lavamoat-core@npm%3A14.4.1#~/.yarn/patches/lavamoat-core-npm-14.4.1-c4e8bbb016.patch::version=14.4.1&hash=5307c6" + resolution: "lavamoat-core@patch:lavamoat-core@npm%3A14.4.1#~/.yarn/patches/lavamoat-core-npm-14.4.1-c4e8bbb016.patch::version=14.4.1&hash=1822ab" dependencies: json-stable-stringify: "npm:^1.0.2" lavamoat-tofu: "npm:^6.2.1" merge-deep: "npm:^3.0.3" - checksum: 47a7f3863bd7b7ddb59ea6dad15a48859538725b0ed7bc53fd78a1a3f752c86f77b83f554c6b4a27420beb07d088fbfe1fd0847048c4e53174599d526d503fe8 + checksum: 53e042240c5bc61aa61f8fc058734e4324243c2e9541c40c3445686238871a287f72ffce19cfc4c04ccf659e75fbec188460a14b8e6c61b36220042038d2eb18 languageName: node linkType: hard @@ -23840,16 +23943,16 @@ __metadata: "@metamask/ppom-validator": "npm:^0.5.0" "@metamask/providers": "npm:^13.0.0" "@metamask/rate-limit-controller": "npm:^3.0.0" - "@metamask/rpc-methods": "npm:^2.0.0" + "@metamask/rpc-methods": "npm:^3.0.0" "@metamask/safe-event-emitter": "npm:^2.0.0" "@metamask/scure-bip39": "npm:^2.0.3" "@metamask/selected-network-controller": "npm:^1.0.0" "@metamask/signature-controller": "npm:^6.0.0" "@metamask/slip44": "npm:^3.0.0" "@metamask/smart-transactions-controller": "npm:^4.0.0" - "@metamask/snaps-controllers": "npm:^2.0.2" - "@metamask/snaps-ui": "npm:^2.0.0" - "@metamask/snaps-utils": "npm:^2.0.1" + "@metamask/snaps-controllers": "npm:^3.0.0" + "@metamask/snaps-ui": "npm:^3.0.0" + "@metamask/snaps-utils": "npm:^3.0.0" "@metamask/test-dapp": "npm:^7.1.0" "@metamask/utils": "npm:^5.0.0" "@ngraveio/bc-ur": "npm:^1.1.6" @@ -24091,7 +24194,7 @@ __metadata: through2: "npm:^4.0.2" ts-node: "npm:^10.5.0" ttest: "npm:^2.1.1" - typescript: "npm:~4.4.0" + typescript: "npm:~4.5.0" unicode-confusables: "npm:^0.1.1" uuid: "npm:^8.3.2" vinyl: "npm:^2.2.1" @@ -32881,16 +32984,6 @@ __metadata: languageName: node linkType: hard -"typescript@npm:4.4.4": - version: 4.4.4 - resolution: "typescript@npm:4.4.4" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 20663db4fb18d0f6b5778b8103c5a7d5ad784947c7e94259c302aefd6413f4e9ec8075af5e8b5ee972cc7ea167aa74cb8735f31468b57c79c8013f601bd793cf - languageName: node - linkType: hard - "typescript@npm:^3.9.10, typescript@npm:^3.9.7": version: 3.9.10 resolution: "typescript@npm:3.9.10" @@ -32921,6 +33014,16 @@ __metadata: languageName: node linkType: hard +"typescript@npm:~4.5.0": + version: 4.5.5 + resolution: "typescript@npm:4.5.5" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 6b1a99a272bb6bf701e6f5f7e23455049a85db4958cd19bc4c2d25025b5af5751756962ae7a8bbcc1e339fa5209384f5e15352aa973c2121d7f8f525067106b3 + languageName: node + linkType: hard + "typescript@patch:typescript@npm%3A^3.9.10#optional!builtin, typescript@patch:typescript@npm%3A^3.9.7#optional!builtin": version: 3.9.10 resolution: "typescript@patch:typescript@npm%3A3.9.10#optional!builtin::version=3.9.10&hash=3bd3d3" @@ -32951,23 +33054,13 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm:4.4.4#.yarn/patches/typescript-npm-4.4.4-3fedcc07a3.patch::locator=metamask-crx%40workspace%3A.": - version: 4.4.4 - resolution: "typescript@patch:typescript@npm%3A4.4.4#.yarn/patches/typescript-npm-4.4.4-3fedcc07a3.patch::version=4.4.4&hash=8ca643&locator=metamask-crx%40workspace%3A." - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: cd2f71ab0e2fe5e28b8691d89e61b0e8b3f4f7d8ef3e7e77a9e7f9b369ffc352df010c1e80c140cb6d7ef727f2647b3f4bf51db98e8157b7be18e58f734f7578 - languageName: node - linkType: hard - -"typescript@patch:typescript@patch%3Atypescript@npm%3A4.4.4%23.yarn/patches/typescript-npm-4.4.4-3fedcc07a3.patch%3A%3Alocator=metamask-crx%2540workspace%253A.#optional!builtin": - version: 4.4.4 - resolution: "typescript@patch:typescript@patch%3Atypescript@npm%253A4.4.4%23.yarn/patches/typescript-npm-4.4.4-3fedcc07a3.patch%3A%3Aversion=4.4.4&hash=8ca643&locator=metamask-crx%2540workspace%253A.#optional!builtin::version=4.4.4&hash=bbeadb" +"typescript@patch:typescript@npm%3A~4.5.0#optional!builtin": + version: 4.5.5 + resolution: "typescript@patch:typescript@npm%3A4.5.5#optional!builtin::version=4.5.5&hash=bcec9a" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 443daaab2da2c17da6b1c17e9e19575564e8e201f30bc7f2fd7321ae81afb8b5e88bf64a6191f147a037b8eee7b18d0caf0c7ace946d7b91722ff26a0befc132 + checksum: 3875b1a307d4e01bcdb7537ba708b4c937dd6c89ef230391e9957983b642b0cd58f3355098fb717b7c97753f56d9cde0d3f817e5367d5b5c20f357be961b3c71 languageName: node linkType: hard From 2026ef96ddcbcb33cc03232dbea7fd656b67ad34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= Date: Tue, 10 Oct 2023 09:58:13 +0100 Subject: [PATCH 079/219] [MMI] Sorts list elements alphabetically (#21262) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** Sorts the list elements from the MMI component, in alphabetical order. ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. ## **Pre-merge reviewer checklist** - [x] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [x] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- .../connect-custody/account-list.js | 196 +++++++++--------- 1 file changed, 101 insertions(+), 95 deletions(-) diff --git a/ui/pages/institutional/connect-custody/account-list.js b/ui/pages/institutional/connect-custody/account-list.js index 6541de160f67..a4ecd7a0b9c4 100644 --- a/ui/pages/institutional/connect-custody/account-list.js +++ b/ui/pages/institutional/connect-custody/account-list.js @@ -59,118 +59,124 @@ export default function CustodyAccountList({ className="custody-account-list" data-testid="custody-account-list" > - {accounts.map((account, idx) => ( - + {accounts + .sort((a, b) => + a.name + .toLocaleLowerCase() + .localeCompare(b.name.toLocaleLowerCase()), + ) + .map((account, idx) => ( - {!rawList && ( - - onAccountChange({ - name: account.name, - address: account.address, - custodianDetails: account.custodianDetails, - labels: account.labels, - chainId: account.chainId, - }) - } - checked={selectedAccounts[account.address] || false} - /> - )} - - - - + - - - {shortenAddress(account.address)} - - - + + - - - - {account.labels && ( - - )} + + + + + + + + {account.labels && ( + + )} + - - ))} + ))} {!rawList && ( From 329bd5d90273d90cb20aca32cc953ce9e0bca7ce Mon Sep 17 00:00:00 2001 From: Ariella Vu <20778143+digiwand@users.noreply.github.com> Date: Tue, 10 Oct 2023 12:16:28 +0200 Subject: [PATCH 080/219] test:e2e: create Blockaid Security Alert tests for eth_sendTransaction requests and no PPOM response request (#21086) - create tests/e2e/snaps/ppom-malicious-erc20-approval.spec.js - create tests/e2e/snaps/ppom-malicious-erc20-transfer.spec.js - create helper method FixtureBuilder#withNetworkControllerOnMainnet - create test/e2e/mock-server-json-rpc.ts - helper function to mock JSON-RPC requests --- test/e2e/fixture-builder.js | 14 +- test/e2e/flask/ppom-toggle-settings.spec.js | 13 +- test/e2e/mock-server-json-rpc.ts | 69 +++++ test/e2e/run-all.js | 4 +- test/e2e/snaps/ppom-blockaid-alert.spec.js | 205 +++++++------ .../ppom-malicious-erc20-approval.spec.js | 213 +++++++++++++ .../ppom-malicious-erc20-transfer.spec.js | 210 +++++++++++++ test/e2e/tests/ens.spec.js | 11 +- test/mocks/json-rpc-result.ts | 281 ++++++++++++++++++ 9 files changed, 892 insertions(+), 128 deletions(-) create mode 100644 test/e2e/mock-server-json-rpc.ts create mode 100644 test/e2e/snaps/ppom-malicious-erc20-approval.spec.js create mode 100644 test/e2e/snaps/ppom-malicious-erc20-transfer.spec.js create mode 100644 test/mocks/json-rpc-result.ts diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js index 2146938654f0..cc0a696dea9d 100644 --- a/test/e2e/fixture-builder.js +++ b/test/e2e/fixture-builder.js @@ -5,7 +5,7 @@ const { const { merge } = require('lodash'); const { toHex } = require('@metamask/controller-utils'); const { NetworkStatus } = require('@metamask/network-controller'); -const { CHAIN_IDS } = require('../../shared/constants/network'); +const { CHAIN_IDS, NETWORK_TYPES } = require('../../shared/constants/network'); const { ACTION_QUEUE_METRICS_E2E_TEST, } = require('../../shared/constants/test-flags'); @@ -501,6 +501,18 @@ class FixtureBuilder { return this; } + withNetworkControllerOnMainnet() { + merge(this.fixture.data.NetworkController, { + providerConfig: { + chainId: CHAIN_IDS.MAINNET, + nickname: '', + rpcUrl: '', + type: NETWORK_TYPES.MAINNET, + }, + }); + return this; + } + withNftController(data) { merge( this.fixture.data.NftController diff --git a/test/e2e/flask/ppom-toggle-settings.spec.js b/test/e2e/flask/ppom-toggle-settings.spec.js index f3a19631aca6..94afb1181509 100644 --- a/test/e2e/flask/ppom-toggle-settings.spec.js +++ b/test/e2e/flask/ppom-toggle-settings.spec.js @@ -8,22 +8,13 @@ const { } = require('../helpers'); const FixtureBuilder = require('../fixture-builder'); -const mainnetProviderConfig = { - providerConfig: { - chainId: '0x1', - nickname: '', - rpcUrl: '', - type: 'mainnet', - }, -}; - describe('PPOM Settings', function () { it('should not show the PPOM warning when toggle is off', async function () { await withFixtures( { dapp: true, fixtures: new FixtureBuilder() - .withNetworkController(mainnetProviderConfig) + .withNetworkControllerOnMainnet() .withPermissionControllerConnectedToTestDapp() .build(), ganacheOptions: defaultGanacheOptions, @@ -51,7 +42,7 @@ describe('PPOM Settings', function () { { dapp: true, fixtures: new FixtureBuilder() - .withNetworkController(mainnetProviderConfig) + .withNetworkControllerOnMainnet() .withPermissionControllerConnectedToTestDapp() .build(), ganacheOptions: defaultGanacheOptions, diff --git a/test/e2e/mock-server-json-rpc.ts b/test/e2e/mock-server-json-rpc.ts new file mode 100644 index 000000000000..810135247d76 --- /dev/null +++ b/test/e2e/mock-server-json-rpc.ts @@ -0,0 +1,69 @@ +import { MockttpServer } from 'mockttp'; +import { mockJsonRpcResult } from '../mocks/json-rpc-result'; + +type RequestConfig = [ + method: string, + options?: { + /** optional arbitrary method variant name to return various result values */ + methodResultVariant?: string; + /** optional params value for JSON request used in withJsonBodyIncluding() */ + params?: any; + /** optional result value returned in JSON response */ + result?: any; + }, +]; + +const DEFAULT_VARIANT = 'default'; + +/** + * Helper function to assist with mocking JSON-RPC POST requests + * + * @param mockServer + * @param listOfRequestConfigs + * @example + * ``` + * await mockServerJsonRpc(mockServer, [ + * ['eth_call', { + * params: ['0x52cbe0f49ccdd4dc6e9c13bab024eabd2842045b'], + * result: '0x0000000000000000000000000000000000000000000000000ddfe4d79cbd3de5', + * }], + * ['eth_call', { + * methodResultVariant: 'balanceChecker', + * params: [{to :'0x52cbe0f49ccdd4dc6e9c13bab024eabd2842045b'}], + * }], + * ['eth_gasPrice], + * ['eth_getBalance', { + * result: '0x27d17a5b79f77509541', + * }], + * ['eth_getBlockByNumber'] + * ]); + * ``` + */ +async function mockServerJsonRpc( + mockServer: MockttpServer, + listOfRequestConfigs: RequestConfig[], +) { + for (const [method, options] of listOfRequestConfigs) { + const { methodResultVariant, params, result: _result } = options || {}; + + const result = + _result || + mockJsonRpcResult[method][methodResultVariant || DEFAULT_VARIANT]; + + await mockServer + .forPost() + .withJsonBodyIncluding(params ? { method, params } : { method }) + .thenCallback((req: any) => { + return { + statusCode: 200, + json: { + jsonrpc: '2.0', + id: req.body.json.id, + result, + }, + }; + }); + } +} + +module.exports = { mockServerJsonRpc }; diff --git a/test/e2e/run-all.js b/test/e2e/run-all.js index f74ae8473cf5..392ea6c87855 100644 --- a/test/e2e/run-all.js +++ b/test/e2e/run-all.js @@ -140,12 +140,14 @@ async function main() { if (buildType !== 'flask') { const filteredTests = [ 'settings-add-snap-account-toggle.spec.js', - 'test-snap-accounts.spec.js', 'test-create-snap-account.spec.js', 'test-remove-accounts-snap.spec.js', + 'test-snap-accounts.spec.js', 'test-snap-lifecycle.spec.js', 'test-snap-get-locale.spec.js', 'ppom-blockaid-alert.spec.js', + 'ppom-malicious-erc20-approval.spec.js', + 'ppom-malicious-erc20-transfer.spec.js', 'ppom-toggle-settings.spec.js', 'petnames.spec.js', ]; diff --git a/test/e2e/snaps/ppom-blockaid-alert.spec.js b/test/e2e/snaps/ppom-blockaid-alert.spec.js index a9fb855acb24..c1c6c857760e 100644 --- a/test/e2e/snaps/ppom-blockaid-alert.spec.js +++ b/test/e2e/snaps/ppom-blockaid-alert.spec.js @@ -1,5 +1,7 @@ const { strict: assert } = require('assert'); const FixtureBuilder = require('../fixture-builder'); +const { mockServerJsonRpc } = require('../mock-server-json-rpc'); + const { defaultGanacheOptions, getWindowHandles, @@ -8,94 +10,23 @@ const { withFixtures, } = require('../helpers'); -const { - CHAIN_IDS, - NETWORK_TYPES, -} = require('../../../shared/constants/network'); - const bannerAlertSelector = '[data-testid="security-provider-banner-alert"]'; const selectedAddress = '0x5cfe73b6021e818b776b421b1c4db2474086a7e1'; -const mainnetProviderConfig = { - providerConfig: { - chainId: CHAIN_IDS.MAINNET, - nickname: '', - rpcUrl: '', - type: NETWORK_TYPES.MAINNET, - }, -}; - async function mockInfura(mockServer) { - await mockServer - .forPost() - .withJsonBodyIncluding({ method: 'eth_estimateGas' }) - .thenCallback((req) => { - return { - statusCode: 200, - json: { - jsonrpc: '2.0', - id: req.body.json.id, - result: '0x5cec', - }, - }; - }); - await mockServer - .forPost() - .withJsonBodyIncluding({ method: 'eth_getBalance' }) - .thenCallback((req) => { - return { - statusCode: 200, - json: { - jsonrpc: '2.0', - id: req.body.json.id, - result: '0x55DE6A779BBAC0000', - }, - }; - }); - await mockServer - .forPost() - .withJsonBodyIncluding({ method: 'eth_getTransactionCount' }) - .thenCallback((req) => { - return { - statusCode: 200, - json: { - jsonrpc: '2.0', - id: req.body.json.id, - result: '0x115e89f', - }, - }; - }); - await mockServer - .forPost() - .withJsonBodyIncluding({ method: 'eth_blockNumber' }) - .thenCallback((req) => { - return { - statusCode: 200, - json: { - jsonrpc: '2.0', - id: req.body.json.id, - result: '0x1', - // result: '0x115e89f', - }, - }; - }); - await mockServer - .forPost() - .withJsonBodyIncluding({ method: 'eth_gasPrice' }) - .thenCallback((req) => { - return { - statusCode: 200, - json: { - jsonrpc: '2.0', - id: req.body.json.id, - result: '0x09184e72a000', - }, - }; - }); + await mockServerJsonRpc(mockServer, [ + ['eth_blockNumber'], + ['eth_call'], + ['eth_estimateGas'], + ['eth_gasPrice'], + ['eth_getBalance'], + ]); } /** - * Tests various Blockaid PPOM security alerts. Data for the E2E test requests and responses are provided here: + * Tests various Blockaid PPOM security alerts. Some other tests live in separate files due to + * the need for more sophisticated JSON-RPC mock requests. Some example PPOM Blockaid + * requests and responses are provided here: * * @see {@link https://wobbly-nutmeg-8a5.notion.site/MM-E2E-Testing-1e51b617f79240a49cd3271565c6e12d} */ @@ -105,7 +36,7 @@ describe('Confirmation Security Alert - Blockaid', function () { { dapp: true, fixtures: new FixtureBuilder() - .withNetworkController(mainnetProviderConfig) + .withNetworkControllerOnMainnet() .withPermissionControllerConnectedToTestDapp() .withPreferencesController({ securityAlertsEnabled: true, @@ -123,19 +54,22 @@ describe('Confirmation Security Alert - Blockaid', function () { const testBenignConfigs = [ { - logExpectedDetail: 'Benign 1', + logExpectedDetail: 'Benign eth_sendTransaction with no value', + btnSelector: '#sendButton', + }, + { + logExpectedDetail: 'Benign eth_sendTransaction with value', method: 'eth_sendTransaction', params: [ { from: selectedAddress, - data: '0x095ea7b3000000000000000000000000000000000022d473030f116ddee9f6b43ac78ba3ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', - to: '0x6b175474e89094c44da98b954eedeac495271d0f', - value: '0x0', + to: '0xf977814e90da44bfa03b6295a0616a897441acec', + value: '0x9184e72a000', }, ], }, { - logExpectedDetail: 'blur', + logExpectedDetail: 'Benign Blur eth_sendTransaction', method: 'eth_signTypedData_v4', params: [ selectedAddress, @@ -143,27 +77,35 @@ describe('Confirmation Security Alert - Blockaid', function () { ], }, { - logExpectedDetail: 'seaport', + logExpectedDetail: 'Benign Seaport eth_sendTransaction', method: 'eth_signTypedData_v4', params: [ selectedAddress, '{"types":{"EIP712Domain":[{"name":"name","type":"string"},{"name":"version","type":"string"},{"name":"chainId","type":"uint256"},{"name":"verifyingContract","type":"address"}],"OrderComponents":[{"name":"offerer","type":"address"},{"name":"zone","type":"address"},{"name":"offer","type":"OfferItem[]"},{"name":"consideration","type":"ConsiderationItem[]"},{"name":"orderType","type":"uint8"},{"name":"startTime","type":"uint256"},{"name":"endTime","type":"uint256"},{"name":"zoneHash","type":"bytes32"},{"name":"salt","type":"uint256"},{"name":"conduitKey","type":"bytes32"},{"name":"counter","type":"uint256"}],"OfferItem":[{"name":"itemType","type":"uint8"},{"name":"token","type":"address"},{"name":"identifierOrCriteria","type":"uint256"},{"name":"startAmount","type":"uint256"},{"name":"endAmount","type":"uint256"}],"ConsiderationItem":[{"name":"itemType","type":"uint8"},{"name":"token","type":"address"},{"name":"identifierOrCriteria","type":"uint256"},{"name":"startAmount","type":"uint256"},{"name":"endAmount","type":"uint256"},{"name":"recipient","type":"address"}]},"primaryType":"OrderComponents","domain":{"name":"Seaport","version":"1.4","chainId":"1","verifyingContract":"0x00000000000001ad428e4906aE43D8F9852d0dD6"},"message":{"offerer":"0xCaFca5eDFb361E8A39a735233f23DAf86CBeD5FC","offer":[{"itemType":"1","token":"0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2","identifierOrCriteria":"0","startAmount":"2500000000000000","endAmount":"2500000000000000"}],"consideration":[{"itemType":"2","token":"0xaA7200ee500dE2dcde75E996De83CBD73BCa9705","identifierOrCriteria":"11909","startAmount":"1","endAmount":"1","recipient":"0xCaFca5eDFb361E8A39a735233f23DAf86CBeD5FC"},{"itemType":"1","token":"0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2","identifierOrCriteria":"0","startAmount":"62500000000000","endAmount":"62500000000000","recipient":"0x0000a26b00c1F0DF003000390027140000fAa719"},{"itemType":"1","token":"0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2","identifierOrCriteria":"0","startAmount":"12500000000000","endAmount":"12500000000000","recipient":"0x8324BdEF2F30E08E368f2Fa2F14143cDCA77423D"}],"startTime":"1681835413","endTime":"1682094598","orderType":"0","zone":"0x004C00500000aD104D7DBd00e3ae0A5C00560C00","zoneHash":"0x0000000000000000000000000000000000000000000000000000000000000000","salt":"24446860302761739304752683030156737591518664810215442929812618382526293324216","conduitKey":"0x0000007b02230091a7ed01230072f7006a004d60a8d4e71d599b8104250f0000","totalOriginalConsiderationItems":"3","counter":"0"}}', ], }, + { + logExpectedDetail: 'Benign eth_signTypedData', + btnSelector: '#signTypedData', + }, ]; for (const config of testBenignConfigs) { - const { logExpectedDetail, method, params } = config; + const { btnSelector, logExpectedDetail, method, params } = config; - // Send JSON-RPC request - const request = JSON.stringify({ - jsonrpc: '2.0', - method, - params, - }); - await driver.executeScript( - `window.transactionHash = window.ethereum.request(${request})`, - ); + // Either click TestDapp button to send JSON-RPC request or manually send request + if (btnSelector) { + await driver.clickElement(btnSelector); + } else { + const request = JSON.stringify({ + jsonrpc: '2.0', + method, + params, + }); + await driver.executeScript( + `window.transactionHash = window.ethereum.request(${request})`, + ); + } // Wait for confirmation pop-up await driver.waitUntilXWindowHandles(3); @@ -186,14 +128,16 @@ describe('Confirmation Security Alert - Blockaid', function () { }); /** - * Disclaimer: this test may be missing checks for some reason types. e.g. blur, domain, and failed + * Disclaimer: This test does not test all reason types. e.g. 'blur_farming', + * 'malicious_domain', 'unfair_trade'. Some other tests are found in other files: + * e.g. test/e2e/snaps/ppom-malicious-.spec.js */ it('should show security alerts for malicious requests', async function () { await withFixtures( { dapp: true, fixtures: new FixtureBuilder() - .withNetworkController(mainnetProviderConfig) + .withNetworkControllerOnMainnet() .withPermissionControllerConnectedToTestDapp() .withPreferencesController({ securityAlertsEnabled: true, @@ -218,6 +162,12 @@ describe('Confirmation Security Alert - Blockaid', function () { 'If you approve this request, a third party known for scams might take all your assets.', expectedReason: 'permit_farming', }, + { + btnSelector: '#maliciousRawEthButton', + expectedDescription: + 'If you approve this request, a third party known for scams will take all your assets.', + expectedReason: 'raw_native_token_transfer', + }, { btnSelector: '#maliciousSeaport', expectedDescription: @@ -243,16 +193,19 @@ describe('Confirmation Security Alert - Blockaid', function () { const windowHandles = await getWindowHandles(driver, 3); await driver.switchToWindowWithTitle('MetaMask Notification'); - const bannerAlert = await driver.findElement(bannerAlertSelector); - const bannerAlertText = await bannerAlert.getText(); + const bannerAlertFoundByTitle = await driver.findElement({ + css: bannerAlertSelector, + text: expectedTitle, + }); + const bannerAlertText = await bannerAlertFoundByTitle.getText(); assert( - bannerAlertText.includes(expectedTitle), - `Expected banner alert title: ${expectedTitle} \nExpected reason: ${expectedReason}\n`, + bannerAlertFoundByTitle, + `Banner alert not found. Expected Title: ${expectedTitle} \nExpected reason: ${expectedReason}\n`, ); assert( bannerAlertText.includes(expectedDescription), - `Expected banner alert description: ${expectedDescription} \nExpected reason: ${expectedReason}\n`, + `Unexpected banner alert description. Expected: ${expectedDescription} \nExpected reason: ${expectedReason}\n`, ); // Wait for confirmation pop-up to close @@ -262,4 +215,46 @@ describe('Confirmation Security Alert - Blockaid', function () { }, ); }); + + it('should show "Request may not be safe" if the PPOM request fails to check transaction', async function () { + await withFixtures( + { + dapp: true, + fixtures: new FixtureBuilder() + .withNetworkControllerOnMainnet() + .withPermissionControllerConnectedToTestDapp() + .withPreferencesController({ + securityAlertsEnabled: true, + }) + .build(), + defaultGanacheOptions, + title: this.test.title, + }, + + async ({ driver }) => { + await driver.navigate(); + await unlockWallet(driver); + await openDapp(driver); + + // Click TestDapp button to send JSON-RPC request + await driver.clickElement('#maliciousApprovalButton'); + + // Wait for confirmation pop-up + await driver.waitUntilXWindowHandles(3); + await driver.switchToWindowWithTitle('MetaMask Notification'); + + const expectedTitle = 'Request may not be safe'; + + const bannerAlert = await driver.findElement({ + css: bannerAlertSelector, + text: expectedTitle, + }); + + assert( + bannerAlert, + `Banner alert not found. Expected Title: ${expectedTitle} \nExpected reason: transfer_farming\n`, + ); + }, + ); + }); }); diff --git a/test/e2e/snaps/ppom-malicious-erc20-approval.spec.js b/test/e2e/snaps/ppom-malicious-erc20-approval.spec.js new file mode 100644 index 000000000000..e796fc638adc --- /dev/null +++ b/test/e2e/snaps/ppom-malicious-erc20-approval.spec.js @@ -0,0 +1,213 @@ +const { strict: assert } = require('assert'); +const FixtureBuilder = require('../fixture-builder'); +const { mockServerJsonRpc } = require('../mock-server-json-rpc'); + +const { + defaultGanacheOptions, + openDapp, + unlockWallet, + withFixtures, +} = require('../helpers'); + +const bannerAlertSelector = '[data-testid="security-provider-banner-alert"]'; + +const selectedAddress = '0x5cfe73b6021e818b776b421b1c4db2474086a7e1'; +const selectedAddressWithoutPrefix = '5cfe73b6021e818b776b421b1c4db2474086a7e1'; + +const CONTRACT_ADDRESS = { + BalanceChecker: '0xb1f8e55c7f64d203c1400b9d8555d050f94adf39', + BUSD: '0x4fabb145d64652a948d72533023f6e7a623c7c53', + BUSDImplementation: '0x2a3f1a37c04f82aa274f5353834b2d002db91015', + OffChainOracle: '0x52cbe0f49ccdd4dc6e9c13bab024eabd2842045b', +}; + +async function mockInfura(mockServer) { + await mockServerJsonRpc(mockServer, [ + ['eth_blockNumber'], + [ + 'eth_call', + { + methodResultVariant: 'balanceChecker', + params: [{ to: CONTRACT_ADDRESS.BalanceChecker }], + }, + ], + [ + 'eth_call', + { + methodResultVariant: 'offchainOracle', + params: [{ to: CONTRACT_ADDRESS.OffChainOracle }], + }, + ], + [ + 'eth_call', + { + methodResultVariant: 'balance', + params: [ + { + accessList: [], + data: `0x70a08231000000000000000000000000${selectedAddressWithoutPrefix}`, + to: CONTRACT_ADDRESS.BUSD, + }, + ], + }, + ], + ['eth_estimateGas'], + ['eth_gasPrice'], + ['eth_getBalance'], + ['eth_getBlockByNumber'], + [ + 'eth_getCode', + { + methodResultVariant: 'BUSD', + params: [CONTRACT_ADDRESS.BUSD], + }, + ], + ]); + + await mockServer + .forPost() + .withJsonBodyIncluding({ + method: 'debug_traceCall', + params: [{ accessList: [], data: '0x00000000' }], + }) + .thenCallback((req) => { + return { + statusCode: 200, + json: { + jsonrpc: '2.0', + id: req.body.json.id, + result: { + calls: [ + { + error: 'execution reverted', + from: CONTRACT_ADDRESS.BUSD, + gas: '0x1d55c2cb', + gasUsed: '0x39c', + input: '0x00000000', + to: CONTRACT_ADDRESS.BUSDImplementation, + type: 'DELEGATECALL', + value: '0x0', + }, + ], + error: 'execution reverted', + from: '0x0000000000000000000000000000000000000000', + gas: '0x1dcd6500', + gasUsed: '0x721e', + input: '0x00000000', + to: CONTRACT_ADDRESS.BUSD, + type: 'CALL', + value: '0x0', + }, + }, + }; + }); + + await mockServer + .forPost() + .withJsonBodyIncluding({ + method: 'debug_traceCall', + params: [ + { + data: '0x095ea7b3000000000000000000000000e50a2dbc466d01a34c3e8b7e8e45fce4f7da39e6000000000000000000000000000000000000000000000000ffffffffffffffff', + }, + ], + }) + .thenCallback((req) => { + return { + statusCode: 200, + json: { + jsonrpc: '2.0', + id: req.body.json.id, + result: { + calls: [ + { + from: CONTRACT_ADDRESS.BUSD, + gas: '0x291ee', + gasUsed: '0x79bb', + input: + '0x095ea7b3000000000000000000000000e50a2dbc466d01a34c3e8b7e8e45fce4f7da39e6000000000000000000000000000000000000000000000000ffffffffffffffff', + logs: [ + { + address: CONTRACT_ADDRESS.BUSD, + data: '0x000000000000000000000000000000000000000000000000ffffffffffffffff', + topics: [ + '0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925', + `0x000000000000000000000000${selectedAddressWithoutPrefix}`, + '0x000000000000000000000000e50a2dbc466d01a34c3e8b7e8e45fce4f7da39e6', + ], + }, + ], + output: + '0x0000000000000000000000000000000000000000000000000000000000000001', + to: CONTRACT_ADDRESS.BUSDImplementation, + type: 'DELEGATECALL', + value: '0x0', + }, + ], + from: selectedAddress, + gas: '0x30d40', + gasUsed: '0xeac5', + input: + '0x095ea7b3000000000000000000000000e50a2dbc466d01a34c3e8b7e8e45fce4f7da39e6000000000000000000000000000000000000000000000000ffffffffffffffff', + output: + '0x0000000000000000000000000000000000000000000000000000000000000001', + to: CONTRACT_ADDRESS.BUSD, + type: 'CALL', + value: '0x0', + }, + }, + }; + }); +} + +describe('PPOM Blockaid Alert - Malicious ERC20 Approval', function () { + it('should show banner alert', async function () { + await withFixtures( + { + dapp: true, + fixtures: new FixtureBuilder() + .withNetworkControllerOnMainnet() + .withPermissionControllerConnectedToTestDapp() + .withPreferencesController({ + securityAlertsEnabled: true, + }) + .build(), + defaultGanacheOptions, + testSpecificMock: mockInfura, + title: this.test.title, + }, + + async ({ driver }) => { + await driver.navigate(); + await unlockWallet(driver); + await openDapp(driver); + + const expectedTitle = 'This is a deceptive request'; + const expectedDescription = + 'If you approve this request, a third party known for scams might take all your assets.'; + + // Click TestDapp button to send JSON-RPC request + await driver.clickElement('#maliciousApprovalButton'); + + // Wait for confirmation pop-up + await driver.waitUntilXWindowHandles(3); + await driver.switchToWindowWithTitle('MetaMask Notification'); + + const bannerAlertFoundByTitle = await driver.findElement({ + css: bannerAlertSelector, + text: expectedTitle, + }); + const bannerAlertText = await bannerAlertFoundByTitle.getText(); + + assert( + bannerAlertFoundByTitle, + `Banner alert not found. Expected Title: ${expectedTitle} \nExpected reason: approval_farming\n`, + ); + assert( + bannerAlertText.includes(expectedDescription), + `Unexpected banner alert description. Expected: ${expectedDescription} \nExpected reason: approval_farming\n`, + ); + }, + ); + }); +}); diff --git a/test/e2e/snaps/ppom-malicious-erc20-transfer.spec.js b/test/e2e/snaps/ppom-malicious-erc20-transfer.spec.js new file mode 100644 index 000000000000..26c60f2104c6 --- /dev/null +++ b/test/e2e/snaps/ppom-malicious-erc20-transfer.spec.js @@ -0,0 +1,210 @@ +const { strict: assert } = require('assert'); +const FixtureBuilder = require('../fixture-builder'); +const { mockServerJsonRpc } = require('../mock-server-json-rpc'); + +const { + defaultGanacheOptions, + openDapp, + unlockWallet, + withFixtures, +} = require('../helpers'); + +const bannerAlertSelector = '[data-testid="security-provider-banner-alert"]'; + +const selectedAddress = '0x5cfe73b6021e818b776b421b1c4db2474086a7e1'; +const selectedAddressWithoutPrefix = '5cfe73b6021e818b776b421b1c4db2474086a7e1'; + +const CONTRACT_ADDRESS = { + BalanceChecker: '0xb1f8e55c7f64d203c1400b9d8555d050f94adf39', + FiatTokenV2_1: '0xa2327a938febf5fec13bacfb16ae10ecbc4cbdcf', + OffChainOracle: '0x52cbe0f49ccdd4dc6e9c13bab024eabd2842045b', + USDC: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48', +}; + +async function mockInfura(mockServer) { + await mockServerJsonRpc(mockServer, [ + ['eth_blockNumber'], + [ + 'eth_call', + { + methodResultVariant: 'balanceChecker', + params: [{ to: CONTRACT_ADDRESS.BalanceChecker }], + }, + ], + [ + 'eth_call', + { + methodResultVariant: 'offchainOracle', + params: [{ to: CONTRACT_ADDRESS.OffChainOracle }], + }, + ], + [ + 'eth_call', + { + methodResultVariant: 'balance', + params: [ + { + accessList: [], + data: `0x70a08231000000000000000000000000${selectedAddressWithoutPrefix}`, + to: CONTRACT_ADDRESS.USDC, + }, + ], + }, + ], + ['eth_estimateGas'], + ['eth_gasPrice'], + ['eth_getBalance'], + ['eth_getBlockByNumber'], + [ + 'eth_getCode', + { + methodResultVariant: 'USDC', + params: [CONTRACT_ADDRESS.USDC], + }, + ], + ]); + + await mockServer + .forPost() + .withJsonBodyIncluding({ + method: 'debug_traceCall', + params: [{ accessList: [], data: '0x00000000' }], + }) + .thenCallback((req) => { + return { + statusCode: 200, + json: { + jsonrpc: '2.0', + id: req.body.json.id, + result: { + calls: [ + { + error: 'execution reverted', + from: CONTRACT_ADDRESS.USDC, + gas: '0x1d55c2c7', + gasUsed: '0xf0', + input: '0x00000000', + to: CONTRACT_ADDRESS.FiatTokenV2_1, + type: 'DELEGATECALL', + value: '0x0', + }, + ], + error: 'execution reverted', + from: '0x0000000000000000000000000000000000000000', + gas: '0x1dcd6500', + gasUsed: '0x6f79', + input: '0x00000000', + to: CONTRACT_ADDRESS.USDC, + type: 'CALL', + value: '0x0', + }, + }, + }; + }); + + await mockServer + .forPost() + .withJsonBodyIncluding({ + method: 'debug_traceCall', + params: [{ from: selectedAddress }], + }) + .thenCallback((req) => { + const mockFakePhishingAddress = + '5fbdb2315678afecb367f032d93f642f64180aa3'; + + return { + statusCode: 200, + json: { + jsonrpc: '2.0', + id: req.body.json.id, + result: { + calls: [ + { + from: CONTRACT_ADDRESS.USDC, + gas: '0x2923d', + gasUsed: '0x4cac', + input: `0xa9059cbb000000000000000000000000${mockFakePhishingAddress}0000000000000000000000000000000000000000000000000000000000000064`, + logs: [ + { + address: CONTRACT_ADDRESS.USDC, + data: '0x0000000000000000000000000000000000000000000000000000000000000064', + topics: [ + '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef', + `0x000000000000000000000000${selectedAddressWithoutPrefix}`, + `0x000000000000000000000000${mockFakePhishingAddress}`, + ], + }, + ], + output: + '0x0000000000000000000000000000000000000000000000000000000000000001', + to: CONTRACT_ADDRESS.FiatTokenV2_1, + type: 'DELEGATECALL', + value: '0x0', + }, + ], + from: selectedAddress, + gas: '0x30d40', + gasUsed: '0xbd69', + input: `0xa9059cbb000000000000000000000000${mockFakePhishingAddress}0000000000000000000000000000000000000000000000000000000000000064`, + output: + '0x0000000000000000000000000000000000000000000000000000000000000001', + to: CONTRACT_ADDRESS.USDC, + type: 'CALL', + value: '0x0', + }, + }, + }; + }); +} + +describe('PPOM Blockaid Alert - Malicious ERC20 Transfer', function () { + it('should show banner alert', async function () { + await withFixtures( + { + dapp: true, + fixtures: new FixtureBuilder() + .withNetworkControllerOnMainnet() + .withPermissionControllerConnectedToTestDapp() + .withPreferencesController({ + securityAlertsEnabled: true, + }) + .build(), + defaultGanacheOptions, + testSpecificMock: mockInfura, + title: this.test.title, + }, + + async ({ driver }) => { + const expectedTitle = 'This is a deceptive request'; + const expectedDescription = + 'If you approve this request, a third party known for scams will take all your assets.'; + + await driver.navigate(); + await unlockWallet(driver); + await openDapp(driver); + + // Click TestDapp button to send JSON-RPC request + await driver.clickElement('#maliciousERC20TransferButton'); + + // Wait for confirmation pop-up + await driver.waitUntilXWindowHandles(3); + await driver.switchToWindowWithTitle('MetaMask Notification'); + + const bannerAlertFoundByTitle = await driver.findElement({ + css: bannerAlertSelector, + text: expectedTitle, + }); + const bannerAlertText = await bannerAlertFoundByTitle.getText(); + + assert( + bannerAlertFoundByTitle, + `Banner alert not found. Expected Title: ${expectedTitle} \nExpected reason: transfer_farming\n`, + ); + assert( + bannerAlertText.includes(expectedDescription), + `Unexpected banner alert description. Expected: ${expectedDescription} \nExpected reason: transfer_farming\n`, + ); + }, + ); + }); +}); diff --git a/test/e2e/tests/ens.spec.js b/test/e2e/tests/ens.spec.js index 2f6f67cb453c..7ed1ab3bb63e 100644 --- a/test/e2e/tests/ens.spec.js +++ b/test/e2e/tests/ens.spec.js @@ -78,16 +78,7 @@ describe('ENS', function () { it('domain resolves to a correct address', async function () { await withFixtures( { - fixtures: new FixtureBuilder() - .withNetworkController({ - providerConfig: { - chainId: '0x1', - nickname: '', - rpcUrl: '', - type: 'mainnet', - }, - }) - .build(), + fixtures: new FixtureBuilder().withNetworkControllerOnMainnet().build(), ganacheOptions, title: this.test.title, testSpecificMock: mockInfura, diff --git a/test/mocks/json-rpc-result.ts b/test/mocks/json-rpc-result.ts new file mode 100644 index 000000000000..6e07c821d881 --- /dev/null +++ b/test/mocks/json-rpc-result.ts @@ -0,0 +1,281 @@ +const MOCK_BLOCK_NUMBER = '0x1'; + +export interface mockJsonRpcResultType { + [methodName: string]: { [arbitraryVariantName: string]: any }; +} + +export const mockJsonRpcResult: mockJsonRpcResultType = { + eth_blockNumber: { + default: MOCK_BLOCK_NUMBER, + }, + + eth_estimateGas: { + default: '0x5cec', + }, + + eth_call: { + balance: + '0x000000000000000000000000000000000000000000000000000000000001ea4c', + balanceChecker: + '0x0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000091d6cb8fbf55100000000000000000000000000000000000000000000000000014e4d6652a8200000000000000000000000000000000000000000000000000001beca58919dc000000000000000000000000000000000000000000000000000177480e2c2667f0000000000000000000000000000000000000000000000000001d9ae54845818000000000000000000000000000000000000000000000000000009184e72a000', + default: '0x4563918244F40000', + offchainOracle: + '0x0000000000000000000000000000000000000000000000000ddfe4d79cbd3de5', + }, + + eth_gasPrice: { + default: '0x09184e72a000', + }, + + eth_getBalance: { + default: '0x55DE6A779BBAC0000', + }, + + eth_getBlockByNumber: { + default: { + baseFeePerGas: '0x16c696eb7', + difficulty: '0x0', + extraData: '0x6631622e696f', + gasLimit: '0x1c9c380', + gasUsed: '0xa0056a', + hash: '0x46be2982228b663026adae2bcedf1fcff63e244deeb1092a9bf498be54215d0c', + logsBloom: + '0x2937858c6d9cfb38c4d80264a351d63c9128489348959c00413114802722281e0048c4e3038ac093709089b0809a2192e6c185500811b86e2074c92d092a386c0342f1084e3828786823ee6b77080b7cbc9732020058d48c4d5348e78a6440c83bc06011ba0abbc94145107218404cf306b00a63216604053e4aa018000e902795c30170819001002bce21443b1aa083e84029559b61182c694110c0d8340efa8f0d117328a464460c1ec6f4305bac8275b4ce2ec90740a694e2884f810b0320c0c68492e781434908a160a30ced3a1c5041628bb4bc201d9e1502121421e6472e59ac58b6240680128499a9a4fb892083e692155b58a3559eaa123be01f0619', + miner: '0x5124fcc2b3f99f571ad67d075643c743f38f1c34', + mixHash: + '0xdcf58909059bf2c21d9f84862e5f038b622443395b8e91a147353d0403019c6f', + nonce: '0x0000000000000000', + number: MOCK_BLOCK_NUMBER, + parentHash: + '0x40bbc17240a659f2df8f3392a9d6d97f1ec60dd6407ee4553ddf40f32187a5cc', + receiptsRoot: + '0x8daf2c9ec0110723e3332be6de9d2ec7cc616bd6f2cab65c8db3f1116cc92076', + sha3Uncles: + '0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347', + size: '0xf903', + stateRoot: + '0x8329c5c0838396dd640d00ab34f7aad71bf5d3d98a121e182a171f96e811e1dd', + timestamp: '0x651e594f', + totalDifficulty: '0xc70d815d562d3cfa955', + transactions: [ + '0x025d6db129bae563f653c7d0095a308f0fb605a6e519269753df46e9aaa7aeaf', + '0xe01dbeef9af2c47742a1c26069a71a9f70c544c6d80c4f63e5cfb56a6ba5e3db', + '0xc68b76b00344181378fc50e4914e99b6720470bb01d064f42fe721c5473918e2', + '0xe2d4323739c218a04013803f9961309f60b99db49b43e0b2215ac3624ff2da2f', + '0xd132b4a8f258e379bd0d4995347b333abca91b3d83ddba245595dafbb6cdac1a', + '0x0d9e5189abcf712e938bacd595240cd5467fb33ecac8f49ecd828db9eae5d842', + '0x4b9da2de3480e6431e0edc74c6000229417a761372701777dabe0fcc8582d228', + '0x4ab6221a5a2a1bb00e1b6583e9dc6dec05b27873b59ddf8955bfb0173d8f0f69', + '0x3e98a84a91cd8d6a54824804776c22a2f4dbe6d4b62b665d6fa41793c2ed64cc', + '0xb80f1371a9b541dd83c45fe450b54040a0bb949b697896874f73169156829225', + '0x60801d230e5a87cc0f5acae9e9be25a8ff89728a8e8a7f7694452a469cc890a7', + '0x089cb61bababa3a5d9f9aa2c65bba1fe4f659d2931069242d614fa53c991c858', + '0xb301035281c8001d8b1f8bd9423f00c56d144f92da40411a49ef73884dad0565', + '0x994553a9b9aa2348c9eb62165915af53d6aeba33558005fac5fa53953ba87eab', + '0x9f367bfc18e62885a8f9d71edfdeb86bf8256d218dd637015bbb185f1c228e1e', + '0x0c21e73c66d009dab799574510ed5b533256da2332e46f265d2a2ecf4df2f5d4', + '0x54e1fad4103782f1fe2304d1da249e6948dcb7d27646307f7c0f111460ab27e3', + '0xe793c71314eb429a249f26d62c82d588f76022eec775013f25841a441307ac20', + '0x9c33cb549884f94f4b05f095b75735b59ca01341cd8f3399bf9f7b4685f8017b', + '0x2f91e57ef968004af9105642f5b12d9955ff57799b1e983fe74ad3430ffe531c', + '0x617af6cf35eecbed22ac1b1d94e54ec105edf05a6c0d9cc4a5b7bcfdae942942', + '0xd31edbb8f112de1bd194853a0c4d50e9ee3e9a7a079253d50d5b10cb77afa3cd', + '0x0c37629d50b0c9e755c727522112cc381cd7f2ca3b201f1f0332e5b76b0d2eba', + '0xe6ae038c038df8d0091bb043b95c3c335e4ce538324fb1048ca98662a5d3fd8a', + '0xdb369684b55c236cfbcd6a9871621d796a626c43ecf8048d3365bd6854106e77', + '0xe084e6a6c86b9896d8ad654e348f29bba534431d187d32cc348b4c1fbdfb6ac2', + '0x137cbc7fb3cfbc868787c2a35cebc881ce3c130b4eade5592c004d348113e6cc', + '0xe037a224f579ebb494fb7789c99f059039204efca53c69a80259944d866397d6', + '0xc1f78a716f9b14e2f06947212c90b4c06c067574932e9a3d16aa111ea7a08325', + '0x74f30f6f2810711bd580b07cf0df42d71fc1404e555b6bcafbe8f83fbbf0613a', + '0x258ac5c91a8c34c4ece04b66882522d55639051468244a2adfbd421e96411c03', + '0x3eb7f91ae3d16d453d0ca327d02efe4cc46368c8d0148450afd4fbe23b6cd189', + '0x69b9d46d3a380cb836475fd8d7d89230f3cb1d12955ece13adba5ef289b7171f', + '0x9f3196f0211844deb3a84a00efd0224c4c2a1b4bd4ce4ab8289b36cb4083c202', + '0x4c203a40e9affc4f4be28ba9ba22f1c4a5c9e6c4226ebada8e63170e6e127183', + '0xc40a188843a35d90ac44e86b4ef738bf183bf3f44a037a8c5bf172fa1e6b3d82', + '0x87663321079a2233fd0c62f0714508aa03681ba17bbaf1b136668200ec91f94f', + '0xdd6ff72cab1d17bdcb274b67e9daedf142c909a05e0e9f1143c819f42ddc5d85', + '0xb4a922f6582276fdc2dd4d2f8cc87fc318a213e7ba0d87adb388cc2afa948aad', + '0xf48c8fd81c25dc5134d4327696f95cb90345b765658890ccba4842b09a3ee79e', + '0x1cdc4c9ec42401ee52a730c40062054826c518020704ff5afd706037299a3f4c', + '0x4384719429ce682f300c72a4e6d1de302571c53dcb9b925ac19919243027898f', + '0x2d1c5e589bbf1c3d84ac6a48cf6fffe73848add4d2606f2bc164d45d0a539bc5', + '0xcf095997048953d46637f4b23de28a7a0937387ee673aeac78956a4a2d18938e', + '0x4af3b1a11feabd6cdff5957737064abebbb3707aecf8f6f1d19d427f3ea6b88d', + '0xc8d426d5c0b342b1e34e205fec815a4e81dc440d14b2464eda894817746d583c', + '0xc1c83af1aff7327d5ad44eea78290eb25f308ef1d037fd152dc00db23163fac7', + '0x7b612d292c8bc245aac485a48c93e6ab510f79d260f0039c2dbc88cc53153ccf', + '0xcea5beff384c7defa0c290f803303531d68cdd3ea824c1169283206128edb824', + '0xc7ec7fca044fbe37bfeec938a9792f42ab1a3d8255feb00be93e68152ef130f2', + '0x370411cf89cd5e75b12136a0ba61070c0f072ebe877a313d2c55f2b0db96c233', + '0x62ded18451fb7ef92c5f8b3c888f8a304437095725c33691a9cacdc0665174eb', + '0x3be8d2cd758594cedd8a3e249f47ebed0d95ca1c8cbf109941811f0974daae6d', + '0x7eebdbdedf238af9ec6e0fb8860660db88d613b9a1c747de5b38b02763f2901b', + '0x337f14eab5bfdd58af32f28e115a1e2735c6bd52818e407a090d991bcacf900d', + '0xf9b377921e51e97b9a302d69dc55b99eeb96f8232b5fa8518f1cfddc4acd78aa', + '0x6a957b8481ad0935c6c864308ff09e78123daeb64a349b007ed714d810d14f54', + '0x3fafa02783759c232e9d06b65b3104f554e24410eb0ba8a6f02ba33f3e5f0bdb', + '0xaa3dff89f379cbb1f4c916885bb83763455c6cbd2ab4fb466032ada29c16bce0', + '0xc559e193f4abb05bd90f82525a3e14e345106da19cf405c73c462b7e17d4896a', + '0xfd487c02e24f2fbc8306027c459bb6559f8641596051e5dc56477c807324841a', + '0xfd62e1e1c9050034f11cb9e0109bd64cb727b261ca1c94fb4dbe6cdd2e4f8199', + '0xeaf0a50c8b204989689d827cd9ef7704d4fd0ee33fbfd1b6dc49c5ccd025068b', + '0x3fec28b8a00046992cb68b594cd98bf5aa9c11813c88e6d2a3a83a8ff2b1efd8', + '0x43cbfd77dbab4fca9cc310e90ce3e7b5b05e390968bfd43b71bd4e17ce73ae77', + '0x808e4b342458f54c258ce1dafc865d6cac2bdc263a488a988f1c2862fe02beda', + '0xafe2a9c974044d255669e8033d6c2a367c82ba2708f2a7d98c4cab2e1f8e1426', + '0x1aeb33eb00070c71fbb4649f718dff2e559bdfab80027932bbd8bff3e74ea6a6', + '0x9a64a51fdc0ad112b0ac516114e16efe281ed68f0a3eb39837aebbaab1bcbf9c', + '0xa0fe376754f08bbd2d9154283802e4259e46b178580169be0c21abdb8ef1ded8', + '0x8c68f0fbbfbe4ecfb2bc4c859538ee62531bd32dd488dd1b029d9bc2a639db64', + '0xa49bf5d42110fd52c30573bf2aba77b17d4ab081c0b8f68436eb40cf9b5ba3d6', + '0x115bc870a989ae86ad745015bf11cf3c66773ed2d26e80e11b8bc5a065194c13', + '0x316ac31966733f8c6b47aa75d5326a696bf5c4a651cb964df18f90f267dec789', + '0x8008670e8eba15b6d06bf6a7a3cbe9aca543d4e83a3a7369b0433e0b3e3ceae1', + '0x554ff6c269a97976ed8284cbfd024b04024bcf3b25d515d72dbcf038e47a1a08', + '0xa8b227e912c564b0a80aac19e3a618299985264d02a1b6baacf86df40e1ad758', + '0xf1cf308519a9025566d5210f7daf8195fe9c44e38e9cdc6f471c6b2699a7e5f0', + '0x7223a0b7cd4e47fc7b40ded2784cb2af6cb3ffd14674171f1c4c60b1ddb97b9c', + '0xc507db1b36a662139c09c232c00a2ae6c7dd45c1bc05e8d942037fae9d2c8833', + '0xbc15f576fb8e63dc0f7b70255ea0de87efb1082d86ca7f70f1bdef563b584426', + '0xa8d7889cf487e501ce6e3f019eed74f570def855fd47415fed45f3e0cd6e9e7f', + '0x52f950bd0ecb8ba81e6cd20ecf7a6e66371807c624123065adbe3c3d6c288500', + '0xfee006db800181afc124844c31b06924d25f60e8d2296288338af0e7e9f7044f', + '0x82d8d09880a7cab32dd3be06dac2dea0afea41e9f3fd9707a5e25f032dcb966f', + '0x7da65bbc41064b24bb5f272b187fa05df30ea22c768d2e6d336df313a266cb82', + '0x3c13b7c7e236d68d8c4799b71b9b6bd4ce36c520f3b2f29635421950f8a56e03', + '0x72aaefd1673c10dd0d8e5d4726a5eafd3a8726022ab382cf38cbce96c16dc728', + '0x90b5a4a70051fcc4e8312b563e43a1dd02c366f14659111225052d4bcac3a258', + '0xf4aa46063de8baa2ad61b3eabd1f12113e20a16eafd4c2a2e3b93cf94d8c9fcd', + '0xc18d5fa6f953d257cdb4699b58eb3132ad763c20fface4ec13b722e954aefbcf', + '0xd12e95ec8bfea56f712171dbc36c90a5c4bfa945e1dd6b87de9a01568856c23f', + '0x0142e97265b78e5e49b2bd552829753974872b0ebbeebb60257008fed298a203', + '0x532a433729da0def288b673ccbc5a192dffee962c93f1977719b6f8f76269a3d', + '0x1154125dcacd088953bb3eb1b28c547efe50bd40f74ac7e582154d22bcc15c36', + '0xd4bd5c72901df585e344a20125a4be4bc582a7d5ebf07d7999fae27daa31cce5', + '0x4fb02170dfd47274e00db7a23a9ec3446b8d89032438f6b9b5822178e8ad7e77', + '0xc8e62f9804f5e9934601245222a381c2571069fd4a939563517cc59f7b024cde', + '0x86ad26c2223eb7830306e57964e2050acc699ff5a50068ea8e940221fb08679e', + '0x7b96fd3e0f467ee48b6e249175feae53b6cc2a12482d2b2e4ba71774cfbd62cc', + '0xa0336d44a6f2f804fb0b1d83eadc27423242f79676545002da772899dfeea0b3', + '0x28e47bdefa59405e0e3267f047bf46d20304c98661f920fd87fd9f8bbc29e9d3', + '0xb498d5300881fd5f8482b991504876cbe51edcd14b6abda326f48201fc9f2234', + '0xd94762cee129d65e8178eba2c7b2aed14d340cea0bd8e777869003919b186712', + '0x47b50e56928b2b5bfa63adfb411ebf5b20b0fd9e1d3b445867cdfae52ae0aeef', + '0x56cf1b42f63e7718400fd465fa1af37397e5fa2cbe85fd6879f83473f5e3995a', + '0x8a1490011374ffe25b45862d41be4735e08d9e18b1b8b726d4a9d4d8e0194a27', + '0x3489042ecae7846b58488aa770bedd81ad7f1783efd1bee7756b00de4024b65d', + '0x44f85f310884644c48efe8f07cf549408ce942652a8f1f7ad7b01b4bc78399de', + ], + transactionsRoot: + '0xfc1f88c241dff40c33cc8cf48b18b1a59c86346f0f4ea15317142265f20f8b03', + uncles: [], + withdrawals: [ + { + address: '0x036c9c0aae7a8268f332ba968dac5963c6adaca5', + amount: '0xfbd866', + index: '0x1309706', + validatorIndex: '0x90fe9', + }, + { + address: '0x036c9c0aae7a8268f332ba968dac5963c6adaca5', + amount: '0xfbb65d', + index: '0x1309707', + validatorIndex: '0x90fea', + }, + { + address: '0x036c9c0aae7a8268f332ba968dac5963c6adaca5', + amount: '0xfc42ba', + index: '0x1309708', + validatorIndex: '0x90feb', + }, + { + address: '0x036c9c0aae7a8268f332ba968dac5963c6adaca5', + amount: '0x3682aae', + index: '0x1309709', + validatorIndex: '0x90fec', + }, + { + address: '0x036c9c0aae7a8268f332ba968dac5963c6adaca5', + amount: '0xfc16c5', + index: '0x130970a', + validatorIndex: '0x90fed', + }, + { + address: '0x036c9c0aae7a8268f332ba968dac5963c6adaca5', + amount: '0xfc672a', + index: '0x130970b', + validatorIndex: '0x90fee', + }, + { + address: '0x036c9c0aae7a8268f332ba968dac5963c6adaca5', + amount: '0xfbf672', + index: '0x130970c', + validatorIndex: '0x90fef', + }, + { + address: '0x036c9c0aae7a8268f332ba968dac5963c6adaca5', + amount: '0x3664440', + index: '0x130970d', + validatorIndex: '0x90ff0', + }, + { + address: '0x036c9c0aae7a8268f332ba968dac5963c6adaca5', + amount: '0xfbf9c4', + index: '0x130970e', + validatorIndex: '0x90ff1', + }, + { + address: '0x036c9c0aae7a8268f332ba968dac5963c6adaca5', + amount: '0xfc54c4', + index: '0x130970f', + validatorIndex: '0x90ff2', + }, + { + address: '0xd33cd8e9accd0b58a501e6076ad5c41a8702ca62', + amount: '0xdde150', + index: '0x1309710', + validatorIndex: '0x90ff3', + }, + { + address: '0x036c9c0aae7a8268f332ba968dac5963c6adaca5', + amount: '0xfc4959', + index: '0x1309711', + validatorIndex: '0x90ff4', + }, + { + address: '0xd33cd8e9accd0b58a501e6076ad5c41a8702ca62', + amount: '0xde3e8c', + index: '0x1309712', + validatorIndex: '0x90ff5', + }, + { + address: '0x036c9c0aae7a8268f332ba968dac5963c6adaca5', + amount: '0xfc7dbb', + index: '0x1309713', + validatorIndex: '0x90ff6', + }, + { + address: '0x036c9c0aae7a8268f332ba968dac5963c6adaca5', + amount: '0xfc8f5b', + index: '0x1309714', + validatorIndex: '0x90ff7', + }, + { + address: '0x036c9c0aae7a8268f332ba968dac5963c6adaca5', + amount: '0xfc9028', + index: '0x1309715', + validatorIndex: '0x90ff8', + }, + ], + withdrawalsRoot: + '0x43efdf43ed0f1ede09f4ab425311ea16ea229cda5878a44eecc2d0f6d5fc618f', + }, + }, + + eth_getCode: { + BUSD: '0x60806040526004361061006c5763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633659cfe681146100765780634f1ef286146100975780635c60da1b146100b75780638f283970146100e8578063f851a44014610109575b61007461011e565b005b34801561008257600080fd5b50610074600160a060020a0360043516610138565b61007460048035600160a060020a03169060248035908101910135610172565b3480156100c357600080fd5b506100cc6101ea565b60408051600160a060020a039092168252519081900360200190f35b3480156100f457600080fd5b50610074600160a060020a0360043516610227565b34801561011557600080fd5b506100cc610339565b610126610364565b610136610131610411565b610436565b565b61014061045a565b600160a060020a031633600160a060020a03161415610167576101628161047f565b61016f565b61016f61011e565b50565b61017a61045a565b600160a060020a031633600160a060020a031614156101dd5761019c8361047f565b30600160a060020a03163483836040518083838082843782019150509250505060006040518083038185875af19250505015156101d857600080fd5b6101e5565b6101e561011e565b505050565b60006101f461045a565b600160a060020a031633600160a060020a0316141561021c57610215610411565b9050610224565b61022461011e565b90565b61022f61045a565b600160a060020a031633600160a060020a0316141561016757600160a060020a03811615156102e557604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603660248201527f43616e6e6f74206368616e6765207468652061646d696e206f6620612070726f60448201527f787920746f20746865207a65726f206164647265737300000000000000000000606482015290519081900360840190fd5b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f61030e61045a565b60408051600160a060020a03928316815291841660208301528051918290030190a1610162816104c7565b600061034361045a565b600160a060020a031633600160a060020a0316141561021c5761021561045a565b61036c61045a565b600160a060020a031633141561040957604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603260248201527f43616e6e6f742063616c6c2066616c6c6261636b2066756e6374696f6e20667260448201527f6f6d207468652070726f78792061646d696e0000000000000000000000000000606482015290519081900360840190fd5b610136610136565b7f7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c35490565b3660008037600080366000845af43d6000803e808015610455573d6000f35b3d6000fd5b7f10d6a54a4754c8869d6886b5f5d7fbfa5b4522237ea5c60d11bc4e7a1ff9390b5490565b610488816104eb565b60408051600160a060020a038316815290517fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b9181900360200190a150565b7f10d6a54a4754c8869d6886b5f5d7fbfa5b4522237ea5c60d11bc4e7a1ff9390b55565b60006104f6826105ae565b151561058957604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603b60248201527f43616e6e6f742073657420612070726f787920696d706c656d656e746174696f60448201527f6e20746f2061206e6f6e2d636f6e747261637420616464726573730000000000606482015290519081900360840190fd5b507f7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c355565b6000903b11905600a165627a7a72305820b274fe16b200679a229fcce27c65314a32b3cff995c434133f535dd565bba4740029', + USDC: '0x60806040526004361061006d576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633659cfe6146100775780634f1ef286146100ba5780635c60da1b146101085780638f2839701461015f578063f851a440146101a2575b6100756101f9565b005b34801561008357600080fd5b506100b8600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610213565b005b610106600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001908201803590602001919091929391929390505050610268565b005b34801561011457600080fd5b5061011d610308565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561016b57600080fd5b506101a0600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610360565b005b3480156101ae57600080fd5b506101b761051e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b610201610576565b61021161020c610651565b610682565b565b61021b6106a8565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561025c57610257816106d9565b610265565b6102646101f9565b5b50565b6102706106a8565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614156102fa576102ac836106d9565b3073ffffffffffffffffffffffffffffffffffffffff163483836040518083838082843782019150509250505060006040518083038185875af19250505015156102f557600080fd5b610303565b6103026101f9565b5b505050565b60006103126106a8565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614156103545761034d610651565b905061035d565b61035c6101f9565b5b90565b6103686106a8565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561051257600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614151515610466576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260368152602001807f43616e6e6f74206368616e6765207468652061646d696e206f6620612070726f81526020017f787920746f20746865207a65726f20616464726573730000000000000000000081525060400191505060405180910390fd5b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f61048f6106a8565b82604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019250505060405180910390a161050d81610748565b61051b565b61051a6101f9565b5b50565b60006105286106a8565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561056a576105636106a8565b9050610573565b6105726101f9565b5b90565b61057e6106a8565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151515610647576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260328152602001807f43616e6e6f742063616c6c2066616c6c6261636b2066756e6374696f6e20667281526020017f6f6d207468652070726f78792061646d696e000000000000000000000000000081525060400191505060405180910390fd5b61064f610777565b565b6000807f7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c36001029050805491505090565b3660008037600080366000845af43d6000803e80600081146106a3573d6000f35b3d6000fd5b6000807f10d6a54a4754c8869d6886b5f5d7fbfa5b4522237ea5c60d11bc4e7a1ff9390b6001029050805491505090565b6106e281610779565b7fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b81604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390a150565b60007f10d6a54a4754c8869d6886b5f5d7fbfa5b4522237ea5c60d11bc4e7a1ff9390b60010290508181555050565b565b60006107848261084b565b151561081e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252603b8152602001807f43616e6e6f742073657420612070726f787920696d706c656d656e746174696f81526020017f6e20746f2061206e6f6e2d636f6e74726163742061646472657373000000000081525060400191505060405180910390fd5b7f7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c360010290508181555050565b600080823b9050600081119150509190505600a165627a7a72305820a4a547cfc7202c5acaaae74d428e988bc62ad5024eb0165532d3a8f91db4ed240029', + }, +}; From 74130e81e9da5e2acc533a6f0bff191f56360693 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Tue, 10 Oct 2023 17:03:42 +0200 Subject: [PATCH 081/219] Bump `metamask/slip44` (#21294) ## **Description** Bump `metamask/slip44`. Should have no functional changes other than improving the copy on snap installation for certain snaps. --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 65451f5b7981..2fed93c8a407 100644 --- a/package.json +++ b/package.json @@ -275,7 +275,7 @@ "@metamask/scure-bip39": "^2.0.3", "@metamask/selected-network-controller": "^1.0.0", "@metamask/signature-controller": "^6.0.0", - "@metamask/slip44": "^3.0.0", + "@metamask/slip44": "^3.1.0", "@metamask/smart-transactions-controller": "^4.0.0", "@metamask/snaps-controllers": "^3.0.0", "@metamask/snaps-ui": "^3.0.0", diff --git a/yarn.lock b/yarn.lock index e31fcc00c12a..0d7fa0ee5cce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4756,10 +4756,10 @@ __metadata: languageName: node linkType: hard -"@metamask/slip44@npm:^3.0.0": - version: 3.0.0 - resolution: "@metamask/slip44@npm:3.0.0" - checksum: 01e94279922d8e3fcad2e809003ce5045e9f05ee67ce111d6a490f513f11469a3804b70988663cd19ce282a29f27be5046bec8cb66c925bc2e26177884a22ba3 +"@metamask/slip44@npm:^3.1.0": + version: 3.1.0 + resolution: "@metamask/slip44@npm:3.1.0" + checksum: 83f902c455468f1ec252d0554cd4ebf8da1fc9a27ec7199b81e265e5e8710fad86eaa71d86f24500f9db6626007ad71b1380b239e2104e7e558a061393b066fa languageName: node linkType: hard @@ -23948,7 +23948,7 @@ __metadata: "@metamask/scure-bip39": "npm:^2.0.3" "@metamask/selected-network-controller": "npm:^1.0.0" "@metamask/signature-controller": "npm:^6.0.0" - "@metamask/slip44": "npm:^3.0.0" + "@metamask/slip44": "npm:^3.1.0" "@metamask/smart-transactions-controller": "npm:^4.0.0" "@metamask/snaps-controllers": "npm:^3.0.0" "@metamask/snaps-ui": "npm:^3.0.0" From d5579a6268de1c40d7184847e1ca6edda5415026 Mon Sep 17 00:00:00 2001 From: Ariella Vu <20778143+digiwand@users.noreply.github.com> Date: Tue, 10 Oct 2023 17:13:23 +0200 Subject: [PATCH 082/219] =?UTF-8?q?chore:=20move=20PPOM=20e2e=20tests=20fr?= =?UTF-8?q?om=20snaps=20folder=20=E2=86=92=20flask=20folder=20(#21293)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** Thanks @matthewwalsh0 for creating the new flask directory with appropriate configurations! 🙏🏼 ref: [Internal Thread](https://consensys.slack.com/archives/C04T0NWJ16E/p1696940973039259) moving e2e tests from the e2e snaps directory to the e2e flask directory because: 1. PPOM blockaid is not related to snaps 2. this unblocks future PRs from being reviewed by snaps also slipped in a tiny typo fix related to PPOM Blockaid components ## **Manual testing steps** _1. Step1:_ _2. Step2:_ _3. ..._ ## **Screenshots/Recordings** _If applicable, add screenshots and/or recordings to visualize the before and after of your change._ ### **Before** _[screenshot]_ ### **After** _[screenshot]_ ## **Related issues** Fixes: https://github.com/MetaMask/MetaMask-planning/issues/991 ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've clearly explained: - [ ] What problem this PR is solving. - [ ] How this problem was solved. - [ ] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- shared/constants/security-provider.ts | 2 +- .../ppom-blockaid-alert-erc20-approval.spec.js} | 0 .../ppom-blockaid-alert-erc20-transfer.spec.js} | 0 test/e2e/{snaps => flask}/ppom-blockaid-alert.spec.js | 2 +- test/e2e/run-all.js | 4 ++-- 5 files changed, 4 insertions(+), 4 deletions(-) rename test/e2e/{snaps/ppom-malicious-erc20-approval.spec.js => flask/ppom-blockaid-alert-erc20-approval.spec.js} (100%) rename test/e2e/{snaps/ppom-malicious-erc20-transfer.spec.js => flask/ppom-blockaid-alert-erc20-transfer.spec.js} (100%) rename test/e2e/{snaps => flask}/ppom-blockaid-alert.spec.js (99%) diff --git a/shared/constants/security-provider.ts b/shared/constants/security-provider.ts index cb2773d290a6..3bb16f2f0b7e 100644 --- a/shared/constants/security-provider.ts +++ b/shared/constants/security-provider.ts @@ -43,7 +43,7 @@ export enum BlockaidReason { transferFarming = 'transfer_farming', /** Direct theft of assets using transferFrom */ transferFromFarming = 'transfer_from_farming', - /** Malicious trade that results in the victim being rained */ + /** Malicious trade that results in the victim being drained */ unfairTrade = 'unfair_trade', other = 'other', diff --git a/test/e2e/snaps/ppom-malicious-erc20-approval.spec.js b/test/e2e/flask/ppom-blockaid-alert-erc20-approval.spec.js similarity index 100% rename from test/e2e/snaps/ppom-malicious-erc20-approval.spec.js rename to test/e2e/flask/ppom-blockaid-alert-erc20-approval.spec.js diff --git a/test/e2e/snaps/ppom-malicious-erc20-transfer.spec.js b/test/e2e/flask/ppom-blockaid-alert-erc20-transfer.spec.js similarity index 100% rename from test/e2e/snaps/ppom-malicious-erc20-transfer.spec.js rename to test/e2e/flask/ppom-blockaid-alert-erc20-transfer.spec.js diff --git a/test/e2e/snaps/ppom-blockaid-alert.spec.js b/test/e2e/flask/ppom-blockaid-alert.spec.js similarity index 99% rename from test/e2e/snaps/ppom-blockaid-alert.spec.js rename to test/e2e/flask/ppom-blockaid-alert.spec.js index c1c6c857760e..607e99816f47 100644 --- a/test/e2e/snaps/ppom-blockaid-alert.spec.js +++ b/test/e2e/flask/ppom-blockaid-alert.spec.js @@ -130,7 +130,7 @@ describe('Confirmation Security Alert - Blockaid', function () { /** * Disclaimer: This test does not test all reason types. e.g. 'blur_farming', * 'malicious_domain', 'unfair_trade'. Some other tests are found in other files: - * e.g. test/e2e/snaps/ppom-malicious-.spec.js + * e.g. test/e2e/flask/ppom-blockaid-alert-.spec.js */ it('should show security alerts for malicious requests', async function () { await withFixtures( diff --git a/test/e2e/run-all.js b/test/e2e/run-all.js index 392ea6c87855..0f9b3c07c973 100644 --- a/test/e2e/run-all.js +++ b/test/e2e/run-all.js @@ -146,8 +146,8 @@ async function main() { 'test-snap-lifecycle.spec.js', 'test-snap-get-locale.spec.js', 'ppom-blockaid-alert.spec.js', - 'ppom-malicious-erc20-approval.spec.js', - 'ppom-malicious-erc20-transfer.spec.js', + 'ppom-blockaid-alert-erc20-approval.spec.js', + 'ppom-blockaid-alert-erc20-transfer.spec.js', 'ppom-toggle-settings.spec.js', 'petnames.spec.js', ]; From 1026a7a61523251eca8a0115c720c6c732d4bafd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= Date: Tue, 10 Oct 2023 16:23:32 +0100 Subject: [PATCH 083/219] [MMI] Hides the whatsNewPopup for mmi (#21283) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** We don't want to show the WhatsNewPopup in MMI, and this way we are hiding it. ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. ## **Pre-merge reviewer checklist** - [x] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [x] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- ui/pages/home/home.component.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js index 85708fa9eceb..cc23bf2d25ae 100644 --- a/ui/pages/home/home.component.js +++ b/ui/pages/home/home.component.js @@ -13,6 +13,7 @@ import NftsTab from '../../components/app/nfts-tab'; ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-flask) import TermsOfUsePopup from '../../components/app/terms-of-use-popup'; import RecoveryPhraseReminder from '../../components/app/recovery-phrase-reminder'; +import WhatsNewPopup from '../../components/app/whats-new-popup'; ///: END:ONLY_INCLUDE_IN import HomeNotification from '../../components/app/home-notification'; import MultipleNotifications from '../../components/app/multiple-notifications'; @@ -23,7 +24,6 @@ import ConnectedSites from '../connected-sites'; import ConnectedAccounts from '../connected-accounts'; import { Tabs, Tab } from '../../components/ui/tabs'; import { EthOverview } from '../../components/app/wallet-overview'; -import WhatsNewPopup from '../../components/app/whats-new-popup'; import ActionableMessage from '../../components/ui/actionable-message/actionable-message'; import { @@ -124,6 +124,7 @@ export default class Home extends PureComponent { hasTransactionPendingApprovals: PropTypes.bool.isRequired, hasWatchTokenPendingApprovals: PropTypes.bool, hasWatchNftPendingApprovals: PropTypes.bool, + setConnectedStatusPopoverHasBeenShown: PropTypes.func, ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-flask) shouldShowSeedPhraseReminder: PropTypes.bool.isRequired, isPopup: PropTypes.bool, @@ -140,16 +141,20 @@ export default class Home extends PureComponent { ); } }, + firstTimeFlowType: PropTypes.string, + completedOnboarding: PropTypes.bool, + showWhatsNewPopup: PropTypes.bool.isRequired, + hideWhatsNewPopup: PropTypes.func.isRequired, + announcementsToShow: PropTypes.bool.isRequired, + onboardedInThisUISession: PropTypes.bool, ///: END:ONLY_INCLUDE_IN + newNetworkAddedConfigurationId: PropTypes.string, isNotification: PropTypes.bool.isRequired, firstPermissionsRequestId: PropTypes.string, // This prop is used in the `shouldCloseNotificationPopup` function // eslint-disable-next-line react/no-unused-prop-types totalUnapprovedCount: PropTypes.number.isRequired, - setConnectedStatusPopoverHasBeenShown: PropTypes.func, defaultHomeActiveTabName: PropTypes.string, - firstTimeFlowType: PropTypes.string, - completedOnboarding: PropTypes.bool, onTabClick: PropTypes.func.isRequired, haveSwapsQuotes: PropTypes.bool.isRequired, showAwaitingSwapScreen: PropTypes.bool.isRequired, @@ -162,9 +167,6 @@ export default class Home extends PureComponent { pendingConfirmations: PropTypes.arrayOf(PropTypes.object).isRequired, hasApprovalFlows: PropTypes.bool.isRequired, infuraBlocked: PropTypes.bool.isRequired, - showWhatsNewPopup: PropTypes.bool.isRequired, - hideWhatsNewPopup: PropTypes.func.isRequired, - announcementsToShow: PropTypes.bool.isRequired, ///: BEGIN:ONLY_INCLUDE_IN(snaps) errorsToShow: PropTypes.object.isRequired, shouldShowErrors: PropTypes.bool.isRequired, @@ -186,10 +188,8 @@ export default class Home extends PureComponent { closeNotificationPopup: PropTypes.func.isRequired, newTokensImported: PropTypes.string, setNewTokensImported: PropTypes.func.isRequired, - newNetworkAddedConfigurationId: PropTypes.string, clearNewNetworkAdded: PropTypes.func, setActiveNetwork: PropTypes.func, - onboardedInThisUISession: PropTypes.bool, ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) institutionalConnectRequests: PropTypes.arrayOf(PropTypes.object), mmiPortfolioEnabled: PropTypes.bool, @@ -761,14 +761,14 @@ export default class Home extends PureComponent { seedPhraseBackedUp, showRecoveryPhraseReminder, showTermsOfUsePopup, - ///: END:ONLY_INCLUDE_IN - announcementsToShow, showWhatsNewPopup, hideWhatsNewPopup, - firstTimeFlowType, completedOnboarding, onboardedInThisUISession, + announcementsToShow, + firstTimeFlowType, newNetworkAddedConfigurationId, + ///: END:ONLY_INCLUDE_IN ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) mmiPortfolioEnabled, ///: END:ONLY_INCLUDE_IN @@ -781,6 +781,7 @@ export default class Home extends PureComponent { } const tabPadding = process.env.MULTICHAIN ? 4 : 0; // TODO: Remove tabPadding and add paddingTop={4} to parent container Box of Tabs + ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-flask) const showWhatsNew = completedOnboarding && (!onboardedInThisUISession || firstTimeFlowType === 'import') && @@ -789,7 +790,6 @@ export default class Home extends PureComponent { !process.env.IN_TEST && !newNetworkAddedConfigurationId; - ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-flask) const showTermsOfUse = completedOnboarding && !onboardedInThisUISession && showTermsOfUsePopup; ///: END:ONLY_INCLUDE_IN @@ -820,10 +820,10 @@ export default class Home extends PureComponent { exact />
- {showWhatsNew ? : null} { ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-flask) } + {showWhatsNew ? : null} {!showWhatsNew && showRecoveryPhraseReminder ? ( Date: Tue, 10 Oct 2023 20:58:59 +0530 Subject: [PATCH 084/219] Adding security alert setting to setting search (#21097) --- app/_locales/de/messages.json | 6 ------ app/_locales/el/messages.json | 6 ------ app/_locales/en/messages.json | 6 ------ app/_locales/es/messages.json | 6 ------ app/_locales/fr/messages.json | 6 ------ app/_locales/hi/messages.json | 6 ------ app/_locales/id/messages.json | 6 ------ app/_locales/ja/messages.json | 6 ------ app/_locales/ko/messages.json | 6 ------ app/_locales/pt/messages.json | 6 ------ app/_locales/ru/messages.json | 6 ------ app/_locales/tl/messages.json | 6 ------ app/_locales/tr/messages.json | 6 ------ app/_locales/vi/messages.json | 6 ------ app/_locales/zh_CN/messages.json | 6 ------ test/e2e/tests/settings-search.spec.js | 2 +- ui/components/app/whats-new-popup/whats-new-popup.js | 4 ++-- ui/helpers/constants/settings.js | 6 +++--- .../__snapshots__/experimental-tab.test.js.snap | 6 +++--- .../settings/experimental-tab/experimental-tab.component.js | 2 +- 20 files changed, 10 insertions(+), 100 deletions(-) diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index f45061b4a8fd..01aae5ed9120 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -5036,12 +5036,6 @@ "transactionResubmitted": { "message": "Erneutes Absenden der Transaktion mit Erhöhung der geschätzten Gas-Gebühr auf $1 zu $2." }, - "transactionSecurityCheck": { - "message": "Sicherheitsbenachrichtigungen aktivieren" - }, - "transactionSecurityCheckDescription": { - "message": "Wir verwenden APIs von Drittanbietern, um Risiken bei nicht unterzeichneten Transaktionen und Signaturanfragen zu erkennen und anzuzeigen, bevor Sie diese signieren. Diese Dienste haben Zugriff auf Ihre unsignierten Transaktions- und Signaturanfragen, Ihre Kontoadresse und Ihre bevorzugte Sprache." - }, "transactionSettings": { "message": "Transaktionseinstellungen" }, diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index 35c3a19cf52a..32c4f5fefca2 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -5036,12 +5036,6 @@ "transactionResubmitted": { "message": "Η συναλλαγή υποβλήθηκε ξανά με το εκτιμώμενο τέλος συναλλαγής να έχει αυξηθεί στα $1 στις $2" }, - "transactionSecurityCheck": { - "message": "Ενεργοποίηση ειδοποιήσεων ασφαλείας" - }, - "transactionSecurityCheckDescription": { - "message": "Χρησιμοποιούμε API τρίτων για τον εντοπισμό και την εμφάνιση των κινδύνων που ενέχουν τα ανυπόγραφα αιτήματα συναλλαγών και υπογραφών πριν τα υπογράψετε. Αυτές οι υπηρεσίες θα έχουν πρόσβαση στα ανυπόγραφα αιτήματα συναλλαγών και υπογραφών σας, στη διεύθυνση του λογαριασμού σας και στην προτιμώμενη γλώσσα σας." - }, "transactionSettings": { "message": "Ρυθμίσεις συναλλαγών" }, diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index fecf2b46a3a0..cd61bd131378 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -5323,12 +5323,6 @@ "transactionResubmitted": { "message": "Transaction resubmitted with estimated gas fee increased to $1 at $2" }, - "transactionSecurityCheck": { - "message": "Enable security alerts" - }, - "transactionSecurityCheckDescription": { - "message": "We use third-party APIs to detect and display risks involved in unsigned transaction and signature requests before you sign them. These services will have access to your unsigned transaction and signature requests, your account address, and your preferred language." - }, "transactionSettings": { "message": "Transaction settings" }, diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index c261c448fcbd..3fdd195c1954 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -5036,12 +5036,6 @@ "transactionResubmitted": { "message": "Transacción reenviada con la tarifa de gas aumentada a $1 en $2" }, - "transactionSecurityCheck": { - "message": "Habilitar alertas de seguridad" - }, - "transactionSecurityCheckDescription": { - "message": "Usamos API de terceros para detectar y mostrar los riesgos involucrados en transacciones sin firmar y solicitudes de firma antes de que las firme. Estos servicios tendrán acceso a su transacción no firmada y solicitudes de firma, la dirección de su cuenta y su idioma preferido." - }, "transactionSettings": { "message": "Ajustes de la transacción" }, diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index 9ccb1e2720c0..411087bc2a61 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -5036,12 +5036,6 @@ "transactionResubmitted": { "message": "La transaction a été soumise à nouveau avec une augmentation du prix du gaz, désormais de $1 à $2" }, - "transactionSecurityCheck": { - "message": "Autoriser les fournisseurs de services de vérification des transactions" - }, - "transactionSecurityCheckDescription": { - "message": "Nous utilisons des API tierces pour détecter et afficher les risques liés aux transactions non signées et aux demandes de signature avant que vous ne les signiez. Ces services auront accès à vos transactions non signées et à vos demandes de signature, à l’adresse de votre compte et à la langue que vous préférez." - }, "transactionSettings": { "message": "Paramètres de la transaction" }, diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index 9d1ef0186e2b..d20ea4de1aab 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -5036,12 +5036,6 @@ "transactionResubmitted": { "message": "$2 गैस फ़ीस में $1 वृद्धि के साथ ट्रांसेक्शन फिर से सबमिट किया गया" }, - "transactionSecurityCheck": { - "message": "सुरक्षा अलर्ट एनेबल करें" - }, - "transactionSecurityCheckDescription": { - "message": "आपके हस्ताक्षर करने से पहले अहस्ताक्षरित ट्रांसेक्शन और हस्ताक्षर रिक्वेस्ट्स में शामिल जोखिमों का पता लगाने और दिखाने के लिए हम थर्ड-पार्टी एपीआई का इस्तेमाल करते हैं। इन सेवाओं के पास आपके अहस्ताक्षरित ट्रांसेक्शन और हस्ताक्षर अनुरोध, आपके अकाउंट का एड्रेस और आपकी पसंदीदा भाषा तक पहुंच होगी।" - }, "transactionSettings": { "message": "ट्रांसेक्शन संबंधी सेटिंग्स" }, diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index 10bbac7de0e5..a50065f16d2e 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -5036,12 +5036,6 @@ "transactionResubmitted": { "message": "Transaksi dikirim kembali dengan estimasi biaya gas naik $1 pada $2" }, - "transactionSecurityCheck": { - "message": "Aktifkan peringatan keamanan" - }, - "transactionSecurityCheckDescription": { - "message": "Kami menggunakan API pihak ketiga untuk mendeteksi dan menampilkan berbagai risiko yang muncul dalam transaksi yang belum ditandatangani dan permintaan tanda tangan sebelum Anda menandatanganinya. Layanan ini akan dapat mengakses transaksi yang belum ditandatangani dan permintaan tanda tangan, alamat akun, serta bahasa pilihan Anda." - }, "transactionSettings": { "message": "Pengaturan transaksi" }, diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index 149bbacc4fe7..1e12a4b479e6 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -5036,12 +5036,6 @@ "transactionResubmitted": { "message": "推定のガス代を$2で$1に増加し、トランザクションを再送信しました" }, - "transactionSecurityCheck": { - "message": "セキュリティアラートを有効にする" - }, - "transactionSecurityCheckDescription": { - "message": "当社はサードパーティAPIを使用して、ユーザーが署名する前に未署名のトランザクションおよび署名のリクエストに関するリスクを検出・表示します。このようなサービスは、ユーザーの未署名のトランザクションおよび署名のリクエスト、アカウントアドレス、希望言語にアクセスできます。" - }, "transactionSettings": { "message": "トランザクション設定" }, diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index 053b7d67959c..58e94e487ae1 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -5036,12 +5036,6 @@ "transactionResubmitted": { "message": "$2에서 가스비를 $1(으)로 올린 트랜잭션이 다시 제출되었습니다." }, - "transactionSecurityCheck": { - "message": "보안 경고 활성화" - }, - "transactionSecurityCheckDescription": { - "message": "서명하기 전에 해당 트랜잭션과 서명 요청 관련 위험을 탐지하고 표시하기 위해 타사 API를 이용합니다. 이러한 서비스는 해당 서비스가 아직 서명하지 않은 트랜잭션, 서명 요청, 계정 주소 및 기본 언어에 액세스할 수 있습니다." - }, "transactionSettings": { "message": "트랜잭션 설정" }, diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index 3531889f42fc..37b377932deb 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -5036,12 +5036,6 @@ "transactionResubmitted": { "message": "Transação reenviada com taxa de gás aumentada para $1 às $2" }, - "transactionSecurityCheck": { - "message": "Ativar alertas de segurança" - }, - "transactionSecurityCheckDescription": { - "message": "Usamos APIs de terceiros para detectar e exibir riscos envolvidos em solicitações de assinatura e de transações não assinadas antes que você as assine. Esses serviços terão acesso às suas solicitações de assinatura e de transações não assinadas, ao endereço de sua conta e ao seu idioma preferencial." - }, "transactionSettings": { "message": "Configurações da transação" }, diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index d90737ed3180..723133dd98f3 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -5036,12 +5036,6 @@ "transactionResubmitted": { "message": "Транзакция отправлена повторно с платой за газ, увеличенной до $1, в $2" }, - "transactionSecurityCheck": { - "message": "Включить оповещения безопасности" - }, - "transactionSecurityCheckDescription": { - "message": "Мы используем сторонние API для обнаружения и отображения рисков, связанных с неподписанными транзакциями и запросами подписи, прежде чем вы их подпишете. Эти службы будут иметь доступ к вашим неподписанным транзакциям и запросам подписи, адресу вашего счета и предпочитаемому вами языку." - }, "transactionSettings": { "message": "Настройки транзакции" }, diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json index e6dc3f7b405d..8c7b93eaa030 100644 --- a/app/_locales/tl/messages.json +++ b/app/_locales/tl/messages.json @@ -5036,12 +5036,6 @@ "transactionResubmitted": { "message": "Isinumite ulit ang transaksyon na may tinantyang bayad sa gas na itinaas sa $1 sa $2" }, - "transactionSecurityCheck": { - "message": "Paganahin ang mga alerto sa seguridad" - }, - "transactionSecurityCheckDescription": { - "message": "Gumagamit kami ng mga third-party na API para tumuklas at ipakita ang mga panganib na kasangkot sa hindi napirmahang mga kahilingan sa transaksyon at paglagda bago mo pirmahan ang mga ito. Ang mga serbisyong ito ay magkakaroon ng access sa iyong hindi pa napirmahang mga kahilingan sa transaksyon at paglagda, address ng iyong account, at iyong nais na wika." - }, "transactionSettings": { "message": "Mga setting ng transaksyon" }, diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index cb0cdd1ddf29..5e94764e5963 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -5036,12 +5036,6 @@ "transactionResubmitted": { "message": "İşlem, $2 itibariyle $1 olarak artırılan tahmini gaz ücreti ile yeniden gönderildi" }, - "transactionSecurityCheck": { - "message": "Güvenlik uyarılarını etkinleştir" - }, - "transactionSecurityCheckDescription": { - "message": "İmzalanmamış işleme dahil olan riskleri ve onları imzalamadan önce imza taleplerini algılamak ve göstermek için üçüncü taraf API'lerini kullanırız. Bu hizmetler imzalanmamış işlem ve imza taleplerinize, hesap adresinize ve tercih ettiğiniz dile erişim sağlar." - }, "transactionSettings": { "message": "İşlem ayarları" }, diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index 2f66586dffb5..379dc68ed227 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -5036,12 +5036,6 @@ "transactionResubmitted": { "message": "Đã gửi lại giao dịch với mức phí gas ước tính tăng lên $1 lúc $2" }, - "transactionSecurityCheck": { - "message": "Bật cảnh báo bảo mật" - }, - "transactionSecurityCheckDescription": { - "message": "Chúng tôi sử dụng API của bên thứ ba để phát hiện và hiển thị những rủi ro liên quan đến các yêu cầu chữ ký và giao dịch chưa ký trước khi bạn ký. Những dịch vụ này sẽ có quyền truy cập vào các yêu cầu chữ ký và giao dịch chưa ký, địa chỉ tài khoản và ngôn ngữ yêu thích của bạn." - }, "transactionSettings": { "message": "Cài đặt giao dịch" }, diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index 35eca9b2ab29..622448434f62 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -5036,12 +5036,6 @@ "transactionResubmitted": { "message": "已在 $2 重新提交交易，燃料费预计升至 $1" }, - "transactionSecurityCheck": { - "message": "启用安全提醒" - }, - "transactionSecurityCheckDescription": { - "message": "我们使用第三方 API 来检测和显示未签名交易和签名请求中涉及的风险，然后您再进行签名。这些服务将访问您的未签名交易和签名请求、您的账户地址以及首选语言。" - }, "transactionSettings": { "message": "交易设置" }, diff --git a/test/e2e/tests/settings-search.spec.js b/test/e2e/tests/settings-search.spec.js index 343b16ccfe1b..39513874fff4 100644 --- a/test/e2e/tests/settings-search.spec.js +++ b/test/e2e/tests/settings-search.spec.js @@ -19,7 +19,7 @@ describe('Settings Search', function () { security: 'Reveal Secret', alerts: 'Browsing a website', networks: 'Ethereum Mainnet', - experimental: 'Enable security alerts', + experimental: 'Security alerts', about: 'Terms of Use', }; diff --git a/ui/components/app/whats-new-popup/whats-new-popup.js b/ui/components/app/whats-new-popup/whats-new-popup.js index 3b1b18dd1b28..013d305543b3 100644 --- a/ui/components/app/whats-new-popup/whats-new-popup.js +++ b/ui/components/app/whats-new-popup/whats-new-popup.js @@ -78,7 +78,7 @@ function getActionFunctionById(id, history) { }, 18: () => { updateViewedNotifications({ 18: true }); - history.push(`${EXPERIMENTAL_ROUTE}#transaction-security-check`); + history.push(`${EXPERIMENTAL_ROUTE}#security-alerts`); }, 19: () => { updateViewedNotifications({ 19: true }); @@ -100,7 +100,7 @@ function getActionFunctionById(id, history) { ///: BEGIN:ONLY_INCLUDE_IN(blockaid) 23: () => { updateViewedNotifications({ 23: true }); - history.push(`${EXPERIMENTAL_ROUTE}#transaction-security-check`); + history.push(`${EXPERIMENTAL_ROUTE}#security-alerts`); }, ///: END:ONLY_INCLUDE_IN 24: () => { diff --git a/ui/helpers/constants/settings.js b/ui/helpers/constants/settings.js index f557b3fc9275..23af83fbd845 100644 --- a/ui/helpers/constants/settings.js +++ b/ui/helpers/constants/settings.js @@ -373,9 +373,9 @@ export const SETTINGS_CONSTANTS = [ }, { tabMessage: (t) => t('experimental'), - sectionMessage: (t) => t('transactionSecurityCheck'), - descriptionMessage: (t) => t('transactionSecurityCheckDescription'), - route: `${EXPERIMENTAL_ROUTE}#transaction-security-check`, + sectionMessage: (t) => t('securityAlerts'), + descriptionMessage: (t) => t('securityAlertsDescription'), + route: `${EXPERIMENTAL_ROUTE}#security-alerts`, icon: 'fa fa-flask', }, ]; diff --git a/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap b/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap index 32b6cbac4c9e..e729247b6c66 100644 --- a/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap +++ b/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap @@ -16,11 +16,11 @@ exports[`ExperimentalTab with desktop enabled renders ExperimentalTab component
-

Security alerts -

+
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.component.js b/ui/pages/settings/experimental-tab/experimental-tab.component.js index d6a0c95a42d1..57fb48ad63a2 100644 --- a/ui/pages/settings/experimental-tab/experimental-tab.component.js +++ b/ui/pages/settings/experimental-tab/experimental-tab.component.js @@ -98,7 +98,7 @@ export default class ExperimentalTab extends PureComponent { >
{t('securityAlerts')} From 188ecc90172d6f068359de6cd169fdcfbb078eb9 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Tue, 10 Oct 2023 13:31:14 -0230 Subject: [PATCH 085/219] Cherry-pick change from 0482ab6, so that v11.1.2 build passes The code added in this commit was removed in f860685aa, while a PR merged around the same time used this message key. 0482ab6 readded the message+key, to get unit tests passing, even though the intent of the commit was larger. This commit cherry-picks just the needed change from 0482ab6. --- app/_locales/en/messages.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 77c8e3ec8f06..780889ab8ace 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -632,6 +632,9 @@ "busy": { "message": "Busy" }, + "buy": { + "message": "Buy" + }, "buyAndSell": { "message": "Buy & Sell" }, From a6f058fd60ccea1c7bf5f965bafc4fb6663c4b85 Mon Sep 17 00:00:00 2001 From: David Walsh Date: Tue, 10 Oct 2023 12:12:37 -0500 Subject: [PATCH 086/219] UX: Multichain: Add separator under 'View on Explorer' (#21223) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This PR adds a separator to the Multichain global menu under View on Explorer ## **Manual testing steps** 1. Open the Global Menu 2. See the separator between View on Explorer and its next menu item ## **Screenshots/Recordings** SCR-20231005-txgc ## **Related issues** Fixes: https://github.com/MetaMask/metamask-extension/pull/21220 This issue also references the position of the Account Picker but that is addressed in https://github.com/MetaMask/metamask-extension/pull/21220 ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've clearly explained: - [ ] What problem this PR is solving. - [ ] How this problem was solved. - [ ] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- ui/components/multichain/global-menu/global-menu.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ui/components/multichain/global-menu/global-menu.js b/ui/components/multichain/global-menu/global-menu.js index 0e7fccc76675..c2312a4f3b8d 100644 --- a/ui/components/multichain/global-menu/global-menu.js +++ b/ui/components/multichain/global-menu/global-menu.js @@ -13,6 +13,7 @@ import { import { lockMetamask } from '../../../store/actions'; import { useI18nContext } from '../../../hooks/useI18nContext'; import { + Box, IconName, ///: BEGIN:ONLY_INCLUDE_IN(snaps) Text, @@ -54,6 +55,8 @@ import { import { AlignItems, BackgroundColor, + BlockSize, + BorderColor, Display, JustifyContent, TextAlign, @@ -109,6 +112,11 @@ export const GlobalMenu = ({ closeMenu, anchorElement }) => { closeMenu={closeMenu} address={address} /> + Date: Tue, 10 Oct 2023 15:17:54 -0500 Subject: [PATCH 087/219] ci(codeowners): add privacy reviewers to codeowners (#21241) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** Further locks down the privacy snapshot by adding codeowners for the snapshot file. A new team for this was created by @danjm @MetaMask/extension-privacy-reviewers ## **Manual testing steps** 1. In theory if you branch off this PR and change the codeowners, then push up your branch you'll see that the team has been added to the PR as a codeowner. ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [x] I’ve indicated what issue this PR is linked to: Fixes #??? - [x] I’ve included tests if applicable. - [x] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [x] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [x] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- .github/CODEOWNERS | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 4eb64441690d..76e2a36fcaa4 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -24,6 +24,17 @@ lavamoat/ @MetaMask/extension-devs @MetaMask/supply-c # should be brought to the attention of engineering leadership for # discussion .circleci/ @MetaMask/library-admins @kumavis @brad-decker + +# The privacy-snapshot.json file includes a list of all hosts that the +# extension communicates with during the E2E test suite runs. It is not a +# complete list of all hosts that the extension communicates with until the E2E +# test suite has full coverage. Anytime the privacy-snapshot file changes, +# extra scrutiny should be applied to the pull request to confirm that it does +# not broaden the number of hosts the extension communicates with without also +# providing a path for users to avoid that communication. MetaMask strives to +# make all such communication opt IN versus opt OUT. +privacy-snapshot.json @MetaMask/extension-privacy-reviewers + # The CODEOWNERS file constitutes an agreement amongst organization # admins and maintainers to restrict approval capabilities to a subset # of contributors. Modifications to this file result in a modification of From 1e5578eb3c3bfb94ba9891ddb55e2ebfeeef91ed Mon Sep 17 00:00:00 2001 From: Daniel Rocha Date: Tue, 10 Oct 2023 23:32:20 +0200 Subject: [PATCH 088/219] Add `getAllowedKeyringMethods` hook for Account Snaps (#21246) This PR adds the `getAllowedKeyringMethods` hook. It is used in the `rpc-methods` packed to get the list of allowed Keyring methods for a given origin. --------- Co-authored-by: Frederik Bolding Co-authored-by: Maarten Zuidhoorn Co-authored-by: MetaMask Bot --- .../lib/keyring-snaps-permissions.test.ts | 75 ++++++++++ app/scripts/lib/keyring-snaps-permissions.ts | 82 +++++++++++ app/scripts/metamask-controller.js | 21 +++ lavamoat/browserify/desktop/policy.json | 52 +++---- lavamoat/browserify/flask/policy.json | 52 +++---- package.json | 3 +- shared/constants/snaps/permissions.ts | 3 +- .../settings-add-snap-account-toggle.spec.js | 6 + test/e2e/accounts/utils.ts | 2 +- yarn.lock | 133 +++--------------- 10 files changed, 256 insertions(+), 173 deletions(-) create mode 100644 app/scripts/lib/keyring-snaps-permissions.test.ts create mode 100644 app/scripts/lib/keyring-snaps-permissions.ts rename test/e2e/{tests => accounts}/settings-add-snap-account-toggle.spec.js (88%) diff --git a/app/scripts/lib/keyring-snaps-permissions.test.ts b/app/scripts/lib/keyring-snaps-permissions.test.ts new file mode 100644 index 000000000000..4bbce54b346c --- /dev/null +++ b/app/scripts/lib/keyring-snaps-permissions.test.ts @@ -0,0 +1,75 @@ +import { + SubjectMetadataController, + SubjectType, +} from '@metamask/permission-controller'; +import { KeyringRpcMethod } from '@metamask/keyring-api'; +import { keyringSnapPermissionsBuilder } from './keyring-snaps-permissions'; + +describe('keyringSnapPermissionsBuilder', () => { + const mockController = new SubjectMetadataController({ + subjectCacheLimit: 100, + messenger: { + registerActionHandler: jest.fn(), + publish: jest.fn(), + } as any, + state: {}, + }); + mockController.addSubjectMetadata({ + origin: 'https://some-dapp.com', + subjectType: SubjectType.Website, + }); + + it('returns the methods metamask can call', () => { + const permissions = keyringSnapPermissionsBuilder(mockController); + expect(permissions('metamask')).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(mockController); + expect(permissions('https://some-dapp.com')).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(mockController); + expect(permissions('https://some-other-dapp.com')).toStrictEqual([]); + }); + + 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) => { + const permissions = keyringSnapPermissionsBuilder(mockController); + expect(permissions(origin as any)).toStrictEqual([]); + }); +}); diff --git a/app/scripts/lib/keyring-snaps-permissions.ts b/app/scripts/lib/keyring-snaps-permissions.ts new file mode 100644 index 000000000000..fc3dba14a3f9 --- /dev/null +++ b/app/scripts/lib/keyring-snaps-permissions.ts @@ -0,0 +1,82 @@ +import { + SubjectType, + SubjectMetadataController, +} from '@metamask/permission-controller'; +import { KeyringRpcMethod } from '@metamask/keyring-api'; + +/** + * 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. + */ +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 allowed protocols. On Flask, HTTP is also allowed for testing. + */ +const ALLOWED_PROTOCOLS: string[] = [ + 'https:', + ///: BEGIN:ONLY_INCLUDE_IN(build-flask) + 'http:', + ///: END:ONLY_INCLUDE_IN +]; + +/** + * 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. + */ +function isProtocolAllowed(origin: string): boolean { + const url = new URL(origin); + return ALLOWED_PROTOCOLS.includes(url.protocol); +} + +/** + * Builds a function that returns the list of keyring methods an origin can + * call. + * + * @param controller - Reference to the `SubjectMetadataController`. + * @returns A function that returns the list of keyring methods an origin can + * call. + */ +export function keyringSnapPermissionsBuilder( + controller: SubjectMetadataController, +): (origin: string) => string[] { + return (origin: string) => { + if (origin === 'metamask') { + return METAMASK_ALLOWED_METHODS; + } + + const originMetadata = controller.getSubjectMetadata(origin); + if (originMetadata?.subjectType === SubjectType.Website) { + return isProtocolAllowed(origin) ? WEBSITE_ALLOWED_METHODS : []; + } + + return []; + }; +} diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index f80305a3abb8..2d3e9e7bfa7e 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -166,6 +166,9 @@ import { getTokenValueParam } from '../../shared/lib/metamask-controller-utils'; import { isManifestV3 } from '../../shared/modules/mv3.utils'; import { hexToDecimal } from '../../shared/modules/conversion.utils'; import { ACTION_QUEUE_METRICS_E2E_TEST } from '../../shared/constants/test-flags'; +///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) +import { keyringSnapPermissionsBuilder } from './lib/keyring-snaps-permissions'; +///: END:ONLY_INCLUDE_IN ///: BEGIN:ONLY_INCLUDE_IN(petnames) import { SnapsNameProvider } from './lib/SnapsNameProvider'; @@ -4426,6 +4429,24 @@ export default class MetamaskController extends EventEmitter { 'SnapController:install', origin, ), + ///: END:ONLY_INCLUDE_IN + ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) + hasPermission: this.permissionController.hasPermission.bind( + this.permissionController, + ), + getSnap: this.controllerMessenger.call.bind( + this.controllerMessenger, + 'SnapController:get', + ), + handleSnapRpcRequest: this.controllerMessenger.call.bind( + this.controllerMessenger, + 'SnapController:handleRequest', + ), + getAllowedKeyringMethods: keyringSnapPermissionsBuilder( + this.subjectMetadataController, + ), + ///: END:ONLY_INCLUDE_IN + ///: BEGIN:ONLY_INCLUDE_IN(snaps) }), ); ///: END:ONLY_INCLUDE_IN diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json index 6889e6544be7..bb227f6be7a1 100644 --- a/lavamoat/browserify/desktop/policy.json +++ b/lavamoat/browserify/desktop/policy.json @@ -1233,9 +1233,9 @@ "packages": { "@ethereumjs/tx": true, "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true, - "@metamask/eth-snap-keyring>@metamask/keyring-api": true, "@metamask/eth-snap-keyring>@metamask/utils": true, "@metamask/eth-snap-keyring>uuid": true, + "@metamask/keyring-api": true, "superstruct": true, "webpack>events": true } @@ -1252,31 +1252,6 @@ "eth-sig-util>tweetnacl-util": true } }, - "@metamask/eth-snap-keyring>@metamask/keyring-api": { - "packages": { - "@metamask/eth-snap-keyring>@metamask/keyring-api>@metamask/utils": true, - "@metamask/eth-snap-keyring>@metamask/keyring-api>uuid": true, - "superstruct": true - } - }, - "@metamask/eth-snap-keyring>@metamask/keyring-api>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/key-tree>@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true, - "superstruct": true - } - }, - "@metamask/eth-snap-keyring>@metamask/keyring-api>uuid": { - "globals": { - "crypto": true - } - }, "@metamask/eth-snap-keyring>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1736,6 +1711,31 @@ "TextEncoder": true } }, + "@metamask/keyring-api": { + "packages": { + "@metamask/keyring-api>@metamask/utils": true, + "@metamask/keyring-api>uuid": true, + "superstruct": true + } + }, + "@metamask/keyring-api>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/key-tree>@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true, + "superstruct": true + } + }, + "@metamask/keyring-api>uuid": { + "globals": { + "crypto": true + } + }, "@metamask/keyring-controller": { "packages": { "@metamask/base-controller": true, diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 7423db0e7c24..5d2e9e9db48f 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -1233,9 +1233,9 @@ "packages": { "@ethereumjs/tx": true, "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true, - "@metamask/eth-snap-keyring>@metamask/keyring-api": true, "@metamask/eth-snap-keyring>@metamask/utils": true, "@metamask/eth-snap-keyring>uuid": true, + "@metamask/keyring-api": true, "superstruct": true, "webpack>events": true } @@ -1252,31 +1252,6 @@ "eth-sig-util>tweetnacl-util": true } }, - "@metamask/eth-snap-keyring>@metamask/keyring-api": { - "packages": { - "@metamask/eth-snap-keyring>@metamask/keyring-api>@metamask/utils": true, - "@metamask/eth-snap-keyring>@metamask/keyring-api>uuid": true, - "superstruct": true - } - }, - "@metamask/eth-snap-keyring>@metamask/keyring-api>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/key-tree>@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true, - "superstruct": true - } - }, - "@metamask/eth-snap-keyring>@metamask/keyring-api>uuid": { - "globals": { - "crypto": true - } - }, "@metamask/eth-snap-keyring>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1736,6 +1711,31 @@ "TextEncoder": true } }, + "@metamask/keyring-api": { + "packages": { + "@metamask/keyring-api>@metamask/utils": true, + "@metamask/keyring-api>uuid": true, + "superstruct": true + } + }, + "@metamask/keyring-api>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/key-tree>@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true, + "superstruct": true + } + }, + "@metamask/keyring-api>uuid": { + "globals": { + "crypto": true + } + }, "@metamask/keyring-controller": { "packages": { "@metamask/base-controller": true, diff --git a/package.json b/package.json index 2fed93c8a407..f27b1294435c 100644 --- a/package.json +++ b/package.json @@ -247,7 +247,7 @@ "@metamask/eth-json-rpc-middleware": "^11.0.0", "@metamask/eth-keyring-controller": "^13.0.1", "@metamask/eth-ledger-bridge-keyring": "^0.15.0", - "@metamask/eth-snap-keyring": "0.3.1", + "@metamask/eth-snap-keyring": "^1.0.0-rc.1", "@metamask/eth-token-tracker": "^4.0.0", "@metamask/eth-trezor-keyring": "^1.1.0", "@metamask/etherscan-link": "^2.2.0", @@ -255,6 +255,7 @@ "@metamask/gas-fee-controller": "^6.0.1", "@metamask/jazzicon": "^2.0.0", "@metamask/key-tree": "^9.0.0", + "@metamask/keyring-api": "^1.0.0-rc.1", "@metamask/keyring-controller": "^8.0.1", "@metamask/logging-controller": "^1.0.1", "@metamask/logo": "^3.1.2", diff --git a/shared/constants/snaps/permissions.ts b/shared/constants/snaps/permissions.ts index 47971ad511cf..26d1f8ee9417 100644 --- a/shared/constants/snaps/permissions.ts +++ b/shared/constants/snaps/permissions.ts @@ -25,10 +25,9 @@ export const ExcludedSnapPermissions = Object.freeze({ }); export const ExcludedSnapEndowments = Object.freeze({ - // Move to below fence once implemented + ///: BEGIN:ONLY_INCLUDE_IN(build-main) 'endowment:keyring': 'This endowment is still in development therefore not available.', - ///: BEGIN:ONLY_INCLUDE_IN(build-main) 'endowment:lifecycle-hooks': 'This endowment is experimental and therefore not available.', 'endowment:name-lookup': diff --git a/test/e2e/tests/settings-add-snap-account-toggle.spec.js b/test/e2e/accounts/settings-add-snap-account-toggle.spec.js similarity index 88% rename from test/e2e/tests/settings-add-snap-account-toggle.spec.js rename to test/e2e/accounts/settings-add-snap-account-toggle.spec.js index 54a32f5d1662..c9d2dbfd5010 100644 --- a/test/e2e/tests/settings-add-snap-account-toggle.spec.js +++ b/test/e2e/accounts/settings-add-snap-account-toggle.spec.js @@ -17,6 +17,9 @@ describe('Add snap account experimental settings', function () { // Make sure the "Add snap account" button is not visible. await driver.clickElement('[data-testid="account-menu-icon"]'); + await driver.clickElement( + '[data-testid="multichain-account-menu-popover-action-button"]', + ); await driver.assertElementNotPresent({ text: 'Add snap account', tag: 'button', @@ -39,6 +42,9 @@ describe('Add snap account experimental settings', function () { // Make sure the "Add snap account" button is visible. await driver.clickElement('[data-testid="account-menu-icon"]'); + await driver.clickElement( + '[data-testid="multichain-account-menu-popover-action-button"]', + ); assert.equal( await driver.isElementPresentAndVisible({ text: 'Add snap account', diff --git a/test/e2e/accounts/utils.ts b/test/e2e/accounts/utils.ts index 3aab19654db4..8d844f329326 100644 --- a/test/e2e/accounts/utils.ts +++ b/test/e2e/accounts/utils.ts @@ -1,2 +1,2 @@ export const TEST_SNAPS_SIMPLE_KEYRING_WEBSITE_URL = - 'https://metamask.github.io/snap-simple-keyring/0.2.3/'; + 'https://metamask.github.io/snap-simple-keyring/0.3.0/'; diff --git a/yarn.lock b/yarn.lock index 0d7fa0ee5cce..b3560238caac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4144,19 +4144,19 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-snap-keyring@npm:0.3.1": - version: 0.3.1 - resolution: "@metamask/eth-snap-keyring@npm:0.3.1" +"@metamask/eth-snap-keyring@npm:^1.0.0-rc.1": + version: 1.0.0-rc.1 + resolution: "@metamask/eth-snap-keyring@npm:1.0.0-rc.1" dependencies: "@ethereumjs/tx": "npm:^4.2.0" "@metamask/eth-sig-util": "npm:^7.0.0" - "@metamask/keyring-api": "npm:^0.2.7" - "@metamask/snaps-controllers": "npm:^2.0.0" + "@metamask/keyring-api": "npm:^1.0.0-rc.1" + "@metamask/snaps-controllers": "npm:^3.0.0" "@metamask/utils": "npm:^8.1.0" "@types/uuid": "npm:^9.0.1" superstruct: "npm:^1.0.3" uuid: "npm:^9.0.0" - checksum: 286448d2302b3ac663e71176a8464405cdaa30841e980dbac808913a9c1418b4965625c1e3be3d8b3f601ec59257b365e507aef77cf3edca150d8ea6ac3461f5 + checksum: afb50a755823e249e80731da7e2f3ab4246b900020135eb4c3c657d663f2d44a7a6281f29a9a453f5975bd493e4322bede3d5bea0c94871dda8ce0ceced5f186 languageName: node linkType: hard @@ -4272,19 +4272,19 @@ __metadata: languageName: node linkType: hard -"@metamask/keyring-api@npm:^0.2.7": - version: 0.2.7 - resolution: "@metamask/keyring-api@npm:0.2.7" +"@metamask/keyring-api@npm:^1.0.0-rc.1": + version: 1.0.0-rc.1 + resolution: "@metamask/keyring-api@npm:1.0.0-rc.1" dependencies: "@metamask/providers": "npm:^13.0.0" - "@metamask/rpc-methods": "npm:^2.0.0" - "@metamask/snaps-controllers": "npm:^2.0.0" - "@metamask/snaps-utils": "npm:^2.0.0" + "@metamask/rpc-methods": "npm:^3.0.0" + "@metamask/snaps-controllers": "npm:^3.0.0" + "@metamask/snaps-utils": "npm:^3.0.0" "@metamask/utils": "npm:^8.1.0" "@types/uuid": "npm:^9.0.1" superstruct: "npm:^1.0.3" uuid: "npm:^9.0.0" - checksum: e5c607d4b23fcdb75a32fe17a9a25f46acc0c11a41289f444006fddf334b6f75bac6fcc9b9110ababc69388c64d5cbe8a291ac6a73e821c6e9844735f937ba09 + checksum: 60c418d430d01ec6e8a0ed8e6407bb62bcabfe6933d20f8efd31f82e9ae6d1f2b34009affc621f9bf2570d35fad20e4565305369232742b7830c11a27b053e6f languageName: node linkType: hard @@ -4485,7 +4485,7 @@ __metadata: languageName: node linkType: hard -"@metamask/permission-controller@npm:^4.0.0, @metamask/permission-controller@npm:^4.1.0, @metamask/permission-controller@npm:^4.1.2": +"@metamask/permission-controller@npm:^4.0.0, @metamask/permission-controller@npm:^4.1.2": version: 4.1.2 resolution: "@metamask/permission-controller@npm:4.1.2" dependencies: @@ -4647,23 +4647,6 @@ __metadata: languageName: node linkType: hard -"@metamask/rpc-methods@npm:^2.0.0": - version: 2.0.0 - resolution: "@metamask/rpc-methods@npm:2.0.0" - dependencies: - "@metamask/key-tree": "npm:^9.0.0" - "@metamask/permission-controller": "npm:^4.1.0" - "@metamask/snaps-ui": "npm:^2.0.0" - "@metamask/snaps-utils": "npm:^2.0.0" - "@metamask/types": "npm:^1.1.0" - "@metamask/utils": "npm:^8.1.0" - "@noble/hashes": "npm:^1.3.1" - eth-rpc-errors: "npm:^4.0.3" - superstruct: "npm:^1.0.3" - checksum: d520efa0c8b64f4274dbcefc7e4c7a7a88d65a44c48ac30945a699aaaf025a67a2647bbecae82ad25a5ef2ca81bbf7444385d5d73b0bb2aadb9479e47593e542 - languageName: node - linkType: hard - "@metamask/rpc-methods@npm:^3.0.0": version: 3.0.0 resolution: "@metamask/rpc-methods@npm:3.0.0" @@ -4780,34 +4763,6 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-controllers@npm:^2.0.0": - version: 2.0.2 - resolution: "@metamask/snaps-controllers@npm:2.0.2" - dependencies: - "@metamask/approval-controller": "npm:^3.5.0" - "@metamask/base-controller": "npm:^3.2.0" - "@metamask/object-multiplex": "npm:^1.2.0" - "@metamask/permission-controller": "npm:^4.1.0" - "@metamask/post-message-stream": "npm:^7.0.0" - "@metamask/rpc-methods": "npm:^2.0.0" - "@metamask/snaps-execution-environments": "npm:^2.0.1" - "@metamask/snaps-registry": "npm:^2.0.0" - "@metamask/snaps-utils": "npm:^2.0.1" - "@metamask/utils": "npm:^8.1.0" - "@xstate/fsm": "npm:^2.0.0" - concat-stream: "npm:^2.0.0" - eth-rpc-errors: "npm:^4.0.3" - gunzip-maybe: "npm:^1.4.2" - immer: "npm:^9.0.6" - json-rpc-engine: "npm:^6.1.0" - json-rpc-middleware-stream: "npm:^4.2.0" - nanoid: "npm:^3.1.31" - readable-web-to-node-stream: "npm:^3.0.2" - tar-stream: "npm:^2.2.0" - checksum: edd56d591621e2bdc6e53162058e8cb9f70c619f475aaa2b85fa63e1b4b59979a9343e5bff02066a8b9d933d46b5ca14bce344d7715d3457a738f22eafe1c163 - languageName: node - linkType: hard - "@metamask/snaps-controllers@npm:^3.0.0": version: 3.0.0 resolution: "@metamask/snaps-controllers@npm:3.0.0" @@ -4836,24 +4791,6 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-execution-environments@npm:^2.0.1": - version: 2.0.1 - resolution: "@metamask/snaps-execution-environments@npm:2.0.1" - dependencies: - "@metamask/object-multiplex": "npm:^1.2.0" - "@metamask/post-message-stream": "npm:^7.0.0" - "@metamask/providers": "npm:^11.1.1" - "@metamask/rpc-methods": "npm:^2.0.0" - "@metamask/snaps-utils": "npm:^2.0.1" - "@metamask/utils": "npm:^8.1.0" - eth-rpc-errors: "npm:^4.0.3" - json-rpc-engine: "npm:^6.1.0" - nanoid: "npm:^3.1.31" - superstruct: "npm:^1.0.3" - checksum: 9c2ba350b8dc83d4c3a1acb8c7e8d92c1696196fd893ecf546d049f760d8f989275015c18ea1c8c16dfe411af7ae4c9f015ed436caf4f9110b6f325558431475 - languageName: node - linkType: hard - "@metamask/snaps-execution-environments@npm:^3.0.0": version: 3.0.0 resolution: "@metamask/snaps-execution-environments@npm:3.0.0" @@ -4883,16 +4820,6 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-ui@npm:^2.0.0": - version: 2.0.0 - resolution: "@metamask/snaps-ui@npm:2.0.0" - dependencies: - "@metamask/utils": "npm:^8.1.0" - superstruct: "npm:^1.0.3" - checksum: 9ac3dabb1ca9731d510f10f2d81e0160a3f890b9f32c71f780d0fa1c9e72c26fa5e25f70c60afb1c6e216387634d31ad6c78a45f17f51a34ad1b655045f65586 - languageName: node - linkType: hard - "@metamask/snaps-ui@npm:^3.0.0": version: 3.0.0 resolution: "@metamask/snaps-ui@npm:3.0.0" @@ -4904,35 +4831,6 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-utils@npm:^2.0.0, @metamask/snaps-utils@npm:^2.0.1": - version: 2.0.1 - resolution: "@metamask/snaps-utils@npm:2.0.1" - dependencies: - "@babel/core": "npm:^7.20.12" - "@babel/types": "npm:^7.18.7" - "@metamask/base-controller": "npm:^3.2.0" - "@metamask/key-tree": "npm:^9.0.0" - "@metamask/permission-controller": "npm:^4.1.0" - "@metamask/snaps-registry": "npm:^2.0.0" - "@metamask/snaps-ui": "npm:^2.0.0" - "@metamask/utils": "npm:^8.1.0" - "@noble/hashes": "npm:^1.3.1" - "@scure/base": "npm:^1.1.1" - chalk: "npm:^4.1.2" - cron-parser: "npm:^4.5.0" - eth-rpc-errors: "npm:^4.0.3" - fast-deep-equal: "npm:^3.1.3" - fast-json-stable-stringify: "npm:^2.1.0" - is-svg: "npm:^4.4.0" - rfdc: "npm:^1.3.0" - semver: "npm:^7.5.4" - ses: "npm:^0.18.8" - superstruct: "npm:^1.0.3" - validate-npm-package-name: "npm:^5.0.0" - checksum: 1d85ee5f101bb84b2e0a4aec6effc737786cfc1e812fe59936886988ae62574562f9f062b6f9975c2ca2a8129f36c27202acb51d795ea3ce211ce86dd1d5ee02 - languageName: node - linkType: hard - "@metamask/snaps-utils@npm:^3.0.0": version: 3.0.0 resolution: "@metamask/snaps-utils@npm:3.0.0" @@ -23918,7 +23816,7 @@ __metadata: "@metamask/eth-json-rpc-middleware": "npm:^11.0.0" "@metamask/eth-keyring-controller": "npm:^13.0.1" "@metamask/eth-ledger-bridge-keyring": "npm:^0.15.0" - "@metamask/eth-snap-keyring": "npm:0.3.1" + "@metamask/eth-snap-keyring": "npm:^1.0.0-rc.1" "@metamask/eth-token-tracker": "npm:^4.0.0" "@metamask/eth-trezor-keyring": "npm:^1.1.0" "@metamask/etherscan-link": "npm:^2.2.0" @@ -23927,6 +23825,7 @@ __metadata: "@metamask/gas-fee-controller": "npm:^6.0.1" "@metamask/jazzicon": "npm:^2.0.0" "@metamask/key-tree": "npm:^9.0.0" + "@metamask/keyring-api": "npm:^1.0.0-rc.1" "@metamask/keyring-controller": "npm:^8.0.1" "@metamask/logging-controller": "npm:^1.0.1" "@metamask/logo": "npm:^3.1.2" From 936c26b7e309d2475ec11457e9fe33e235a1663d Mon Sep 17 00:00:00 2001 From: sahar-fehri Date: Wed, 11 Oct 2023 09:34:48 +0200 Subject: [PATCH 089/219] fix: rm not supported currencies (#21153) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** Currently on settings=>General, there are couple currencies that if you select them you will see an error like the following ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/1c829419-cbc8-462d-8164-fadb04cc2cc7) Noticed that this comes from the fact the cryptocompare does not support those currencies: exp for CFI : https://min-api.cryptocompare.com/data/price?fsym=ETH&tsyms=CFI I was not sure how the constant list inside file available-conversions.json was curated, maybe at that time CFI was supported.. Here is the list of currencies that if you click on you would get similar errors: CFI, 1ST, LGD, GIP, SAI, TRST This PR removes the unsupported currencies from the list; ## **Screenshots/Recordings** _If applicable, add screenshots and/or recordings to visualize the before and after of your change._ ### **Before** ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/df0ba99b-86fb-4284-acf3-a42e29d5c40a) ### **After** Currency is removed from list. ## **Related issues** [_Fixes #MMASSETS-37](https://consensyssoftware.atlassian.net/browse/MMASSETS-37) ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [ ] How reviewers can test my changes. - [x] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- .../constants/available-conversions.json | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/ui/helpers/constants/available-conversions.json b/ui/helpers/constants/available-conversions.json index 300bf01461ba..7ac94a2f2848 100644 --- a/ui/helpers/constants/available-conversions.json +++ b/ui/helpers/constants/available-conversions.json @@ -27,10 +27,6 @@ "code": "php", "name": "Philippine Peso" }, - { - "code": "1st", - "name": "FirstBlood" - }, { "code": "adt", "name": "adToken" @@ -59,10 +55,6 @@ "code": "cad", "name": "Canadian Dollar" }, - { - "code": "cfi", - "name": "Cofound.it" - }, { "code": "crb", "name": "CreditBit" @@ -103,10 +95,6 @@ "code": "gnt", "name": "Golem" }, - { - "code": "gup", - "name": "Matchpool" - }, { "code": "hmq", "name": "Humaniq" @@ -115,10 +103,6 @@ "code": "jpy", "name": "Japanese Yen" }, - { - "code": "lgd", - "name": "Legends Room" - }, { "code": "lsk", "name": "Lisk" @@ -207,10 +191,6 @@ "code": "tkn", "name": "TokenCard" }, - { - "code": "trst", - "name": "WeTrust" - }, { "code": "uah", "name": "Ukrainian Hryvnia" @@ -246,9 +226,5 @@ { "code": "dai", "name": "DAI" - }, - { - "code": "sai", - "name": "SAI" } ] From b9f23fef78a52732879edb18c7c90b9bcdca248f Mon Sep 17 00:00:00 2001 From: sahar-fehri Date: Wed, 11 Oct 2023 09:35:45 +0200 Subject: [PATCH 090/219] fix: display network icon (#21205) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This PR fixes one part of the bug shown in this github issue: https://github.com/MetaMask/metamask-extension/issues/20106 When you try to send a token on polygon network and you are on the confirmation page; it shows the value of matic without a unit not an icon to indicate the network. If you are on ethereum network and you try to send an ERC20, it shows ethereum icon. In this PR i am using the AvatarNetwork component that is used on the main tokens page to indicate the network of tokens. ## **Manual testing steps** _1. Switch to polygon _2. Choose an ERC20 token and click send. _3. Add amount in amount input and click confirm and notice there is no unit/network icon displayed ## **Screenshots/Recordings** _If applicable, add screenshots and/or recordings to visualize the before and after of your change._ ### **Before** Ethereum: ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/a7ab2281-9661-4661-9d1a-2d58c91e3026) Polygon ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/1b2d6565-34c6-4381-a228-88f6af57d2b4) BNB ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/6a1f1285-1837-4201-ba8c-185ec1dc5f2d) ### **After** Ethereum: ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/faadf071-8ae4-4f04-8647-36cedf11d633) Polygon: ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/2cd289c5-4e60-4021-a29d-482c94ca096d) BNB: ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/a9094246-7afa-4368-aa70-03c6af9a4d67) ## **Related issues** [_Fixes #MMASSETS-26](https://consensyssoftware.atlassian.net/browse/MMASSETS-26) ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [x] I’ve indicated what issue this PR is linked to: Fixes #??? - [x] I’ve included tests if applicable. - [x] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [x] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- .../confirm-detail-row.component.test.js.snap | 19 +---- .../confirm-detail-row.component.test.js | 11 ++- .../edit-gas-fee-popover.test.js | 12 ++- .../edit-gas-item/edit-gas-item.test.js | 8 +- ...ncel-transaction-gas-fee.component.test.js | 9 +- .../transaction-breakdown.test.js | 9 +- ...-preferenced-currency-display.component.js | 32 ++++--- .../user-preferenced-currency-display.test.js | 11 ++- .../app/wallet-overview/eth-overview.test.js | 9 +- .../confirm-send-ether.test.js.snap | 10 ++- .../confirm-transaction-base.test.js.snap | 10 +-- .../confirm-transaction-base.test.js | 8 +- ui/pages/routes/routes.component.test.js | 21 +++++ .../send-content.component.test.js | 84 ++++++++++++++++++- ui/pages/send/send.test.js | 22 ++++- 15 files changed, 212 insertions(+), 63 deletions(-) diff --git a/ui/components/app/confirm-page-container/confirm-detail-row/__snapshots__/confirm-detail-row.component.test.js.snap b/ui/components/app/confirm-page-container/confirm-detail-row/__snapshots__/confirm-detail-row.component.test.js.snap index 68086ec616ff..ceda298bfe67 100644 --- a/ui/components/app/confirm-page-container/confirm-detail-row/__snapshots__/confirm-detail-row.component.test.js.snap +++ b/ui/components/app/confirm-page-container/confirm-detail-row/__snapshots__/confirm-detail-row.component.test.js.snap @@ -13,17 +13,9 @@ exports[`Confirm Detail Row Component should match snapshot 1`] = ` >
-
- -
@@ -34,15 +26,6 @@ exports[`Confirm Detail Row Component should match snapshot 1`] = ` class="mm-box currency-display-component confirm-detail-row__secondary mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center" title="0" > -
- -
diff --git a/ui/components/app/confirm-page-container/confirm-detail-row/confirm-detail-row.component.test.js b/ui/components/app/confirm-page-container/confirm-detail-row/confirm-detail-row.component.test.js index 5f808c299a2b..221c598eb1e8 100644 --- a/ui/components/app/confirm-page-container/confirm-detail-row/confirm-detail-row.component.test.js +++ b/ui/components/app/confirm-page-container/confirm-detail-row/confirm-detail-row.component.test.js @@ -1,17 +1,22 @@ import React from 'react'; import configureMockStore from 'redux-mock-store'; - import { NetworkStatus } from '@metamask/network-controller'; import { NetworkType } from '@metamask/controller-utils'; import { renderWithProvider } from '../../../../../test/lib/render-helpers'; +import { + CHAIN_IDS, + GOERLI_DISPLAY_NAME, + NETWORK_TYPES, +} from '../../../../../shared/constants/network'; import ConfirmDetailRow from '.'; describe('Confirm Detail Row Component', () => { const mockState = { metamask: { providerConfig: { - type: 'rpc', - chainId: '0x5', + chainId: CHAIN_IDS.GOERLI, + nickname: GOERLI_DISPLAY_NAME, + type: NETWORK_TYPES.GOERLI, }, preferences: { useNativeCurrencyAsPrimaryCurrency: true, diff --git a/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.test.js b/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.test.js index b7382bc5ddb0..eb8287a2da99 100644 --- a/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.test.js +++ b/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.test.js @@ -6,7 +6,11 @@ import { renderWithProvider } from '../../../../test/lib/render-helpers'; import { ETH } from '../../../helpers/constants/common'; import configureStore from '../../../store/store'; import { GasFeeContextProvider } from '../../../contexts/gasFee'; - +import { + NETWORK_TYPES, + CHAIN_IDS, + GOERLI_DISPLAY_NAME, +} from '../../../../shared/constants/network'; import EditGasFeePopover from './edit-gas-fee-popover'; jest.mock('../../../store/actions', () => ({ @@ -53,7 +57,11 @@ const render = ({ txProps, contextProps } = {}) => { const store = configureStore({ metamask: { nativeCurrency: ETH, - providerConfig: {}, + providerConfig: { + chainId: CHAIN_IDS.GOERLI, + nickname: GOERLI_DISPLAY_NAME, + type: NETWORK_TYPES.GOERLI, + }, cachedBalances: {}, accounts: { '0xAddress': { diff --git a/ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.test.js b/ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.test.js index ea3191e2d7e5..3f2aa9c73ef5 100644 --- a/ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.test.js +++ b/ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.test.js @@ -10,7 +10,11 @@ import { ETH } from '../../../../helpers/constants/common'; import configureStore from '../../../../store/store'; import { GasFeeContextProvider } from '../../../../contexts/gasFee'; -import { CHAIN_IDS } from '../../../../../shared/constants/network'; +import { + CHAIN_IDS, + GOERLI_DISPLAY_NAME, + NETWORK_TYPES, +} from '../../../../../shared/constants/network'; import EditGasItem from './edit-gas-item'; jest.mock('../../../../store/actions', () => ({ @@ -62,6 +66,8 @@ const renderComponent = ({ nativeCurrency: ETH, providerConfig: { chainId: CHAIN_IDS.GOERLI, + nickname: GOERLI_DISPLAY_NAME, + type: NETWORK_TYPES.GOERLI, }, cachedBalances: {}, accounts: { diff --git a/ui/components/app/modals/cancel-transaction/cancel-transaction-gas-fee/cancel-transaction-gas-fee.component.test.js b/ui/components/app/modals/cancel-transaction/cancel-transaction-gas-fee/cancel-transaction-gas-fee.component.test.js index 31b225e53ce6..591964bca0b0 100644 --- a/ui/components/app/modals/cancel-transaction/cancel-transaction-gas-fee/cancel-transaction-gas-fee.component.test.js +++ b/ui/components/app/modals/cancel-transaction/cancel-transaction-gas-fee/cancel-transaction-gas-fee.component.test.js @@ -1,13 +1,20 @@ import React from 'react'; import configureMockStore from 'redux-mock-store'; import { renderWithProvider } from '../../../../../../test/lib/render-helpers'; +import { + CHAIN_IDS, + GOERLI_DISPLAY_NAME, + NETWORK_TYPES, +} from '../../../../../../shared/constants/network'; import CancelTransactionGasFee from './cancel-transaction-gas-fee.component'; describe('CancelTransactionGasFee Component', () => { const mockState = { metamask: { providerConfig: { - chainId: '0x4', + chainId: CHAIN_IDS.GOERLI, + nickname: GOERLI_DISPLAY_NAME, + type: NETWORK_TYPES.GOERLI, }, preferences: { useNativeCurrencyAsPrimaryCurrency: false, diff --git a/ui/components/app/transaction-breakdown/transaction-breakdown.test.js b/ui/components/app/transaction-breakdown/transaction-breakdown.test.js index 9f59107a0174..56dc37598e23 100644 --- a/ui/components/app/transaction-breakdown/transaction-breakdown.test.js +++ b/ui/components/app/transaction-breakdown/transaction-breakdown.test.js @@ -2,6 +2,11 @@ import React from 'react'; import configureMockStore from 'redux-mock-store'; import { within } from '@testing-library/react'; import { renderWithProvider } from '../../../../test/jest/rendering'; +import { + MAINNET_DISPLAY_NAME, + NETWORK_TYPES, + CHAIN_IDS, +} from '../../../../shared/constants/network'; import TransactionBreakdown from '.'; function getActualDataFrom(transactionBreakdownRows) { @@ -22,7 +27,9 @@ describe('TransactionBreakdown', () => { nativeCurrency: null, preferences: {}, providerConfig: { - chainId: null, + chainId: CHAIN_IDS.MAINNET, + nickname: MAINNET_DISPLAY_NAME, + type: NETWORK_TYPES.MAINNET, }, }, }); diff --git a/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js b/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js index 3f3999601c7c..04746bc42dac 100644 --- a/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js +++ b/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js @@ -1,13 +1,15 @@ import React, { useMemo } from 'react'; import PropTypes from 'prop-types'; +import { useSelector } from 'react-redux'; import { PRIMARY, SECONDARY } from '../../../helpers/constants/common'; import CurrencyDisplay from '../../ui/currency-display'; import { useUserPreferencedCurrency } from '../../../hooks/useUserPreferencedCurrency'; -import { EtherDenomination } from '../../../../shared/constants/common'; +import { AvatarNetwork, AvatarNetworkSize } from '../../component-library'; +import { getCurrentNetwork } from '../../../selectors'; +import { getNativeCurrency } from '../../../ducks/metamask/metamask'; export default function UserPreferencedCurrencyDisplay({ 'data-testid': dataTestId, - ethLogoHeight = 14, ethNumberOfDecimals, fiatNumberOfDecimals, numberOfDecimals: propsNumberOfDecimals, @@ -17,6 +19,8 @@ export default function UserPreferencedCurrencyDisplay({ showCurrencySuffix, ...restProps }) { + const currentNetwork = useSelector(getCurrentNetwork); + const nativeCurrency = useSelector(getNativeCurrency); const { currency, numberOfDecimals } = useUserPreferencedCurrency(type, { ethNumberOfDecimals, fiatNumberOfDecimals, @@ -25,19 +29,22 @@ export default function UserPreferencedCurrencyDisplay({ }); const prefixComponent = useMemo(() => { return ( - currency === EtherDenomination.ETH && - showEthLogo && ( - ) ); - }, [currency, showEthLogo, ethLogoHeight]); - + }, [ + currency, + showEthLogo, + nativeCurrency, + currentNetwork.nickname, + currentNetwork?.rpcPrefs?.imageUrl, + ]); return ( ); } - UserPreferencedCurrencyDisplay.propTypes = { className: PropTypes.string, 'data-testid': PropTypes.string, diff --git a/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.test.js b/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.test.js index 93ed738eed9a..be5217a2b6a8 100644 --- a/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.test.js +++ b/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.test.js @@ -1,6 +1,11 @@ import React from 'react'; import configureMockStore from 'redux-mock-store'; import { renderWithProvider } from '../../../../test/lib/render-helpers'; +import { + MAINNET_DISPLAY_NAME, + NETWORK_TYPES, + CHAIN_IDS, +} from '../../../../shared/constants/network'; import UserPreferencedCurrencyDisplay from '.'; describe('UserPreferencedCurrencyDisplay Component', () => { @@ -8,7 +13,9 @@ describe('UserPreferencedCurrencyDisplay Component', () => { const mockState = { metamask: { providerConfig: { - chainId: '0x99', + chainId: CHAIN_IDS.MAINNET, + nickname: MAINNET_DISPLAY_NAME, + type: NETWORK_TYPES.MAINNET, }, preferences: { useNativeCurrencyAsPrimaryCurrency: true, @@ -16,13 +23,11 @@ describe('UserPreferencedCurrencyDisplay Component', () => { }, }; const mockStore = configureMockStore()(mockState); - it('should match snapshot', () => { const { container } = renderWithProvider( , mockStore, ); - expect(container).toMatchSnapshot(); }); }); diff --git a/ui/components/app/wallet-overview/eth-overview.test.js b/ui/components/app/wallet-overview/eth-overview.test.js index 1c921df8e069..ae872b847bf9 100644 --- a/ui/components/app/wallet-overview/eth-overview.test.js +++ b/ui/components/app/wallet-overview/eth-overview.test.js @@ -2,7 +2,11 @@ import React from 'react'; import configureMockStore from 'redux-mock-store'; import thunk from 'redux-thunk'; import { fireEvent, waitFor } from '@testing-library/react'; -import { CHAIN_IDS } from '../../../../shared/constants/network'; +import { + CHAIN_IDS, + MAINNET_DISPLAY_NAME, + NETWORK_TYPES, +} from '../../../../shared/constants/network'; import { renderWithProvider } from '../../../../test/jest/rendering'; import { KeyringType } from '../../../../shared/constants/keyring'; import EthOverview from './eth-overview'; @@ -29,8 +33,9 @@ describe('EthOverview', () => { const mockStore = { metamask: { providerConfig: { - type: 'test', chainId: CHAIN_IDS.MAINNET, + nickname: MAINNET_DISPLAY_NAME, + type: NETWORK_TYPES.MAINNET, }, cachedBalances: { '0x1': { diff --git a/ui/pages/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap b/ui/pages/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap index 3b54ae40e943..90014163cd6d 100644 --- a/ui/pages/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap +++ b/ui/pages/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap @@ -288,16 +288,18 @@ exports[`ConfirmSendEther should render correct information for for confirm send >
- +
+ C +
-
- -
diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.test.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.test.js index cc5424348d2e..fee7d33bb7dc 100644 --- a/ui/pages/confirm-transaction-base/confirm-transaction-base.test.js +++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.test.js @@ -10,7 +10,11 @@ import { setBackgroundConnection } from '../../../test/jest'; import { INITIAL_SEND_STATE_FOR_EXISTING_DRAFT } from '../../../test/jest/mocks'; import { GasEstimateTypes } from '../../../shared/constants/gas'; import { KeyringType } from '../../../shared/constants/keyring'; -import { CHAIN_IDS } from '../../../shared/constants/network'; +import { + CHAIN_IDS, + GOERLI_DISPLAY_NAME, + NETWORK_TYPES, +} from '../../../shared/constants/network'; import { TransactionStatus, TransactionType, @@ -102,6 +106,8 @@ const baseStore = { currentCurrency: 'USD', providerConfig: { chainId: CHAIN_IDS.GOERLI, + nickname: GOERLI_DISPLAY_NAME, + type: NETWORK_TYPES.GOERLI, }, nativeCurrency: 'ETH', featureFlags: { diff --git a/ui/pages/routes/routes.component.test.js b/ui/pages/routes/routes.component.test.js index 259039536261..d44ec27f81ac 100644 --- a/ui/pages/routes/routes.component.test.js +++ b/ui/pages/routes/routes.component.test.js @@ -5,6 +5,11 @@ import { fireEvent } from '@testing-library/react'; import { SEND_STAGES } from '../../ducks/send'; import { renderWithProvider } from '../../../test/jest'; import mockSendState from '../../../test/data/mock-send-state.json'; +import { + CHAIN_IDS, + GOERLI_DISPLAY_NAME, + NETWORK_TYPES, +} from '../../../shared/constants/network'; import Routes from '.'; const mockShowNetworkDropdown = jest.fn(); @@ -75,6 +80,14 @@ describe('Routes Component', () => { it('should render with network change disabled while user is in send page', () => { const store = configureMockStore()({ ...mockSendState, + metamask: { + ...mockSendState.metamask, + providerConfig: { + chainId: CHAIN_IDS.GOERLI, + nickname: GOERLI_DISPLAY_NAME, + type: NETWORK_TYPES.GOERLI, + }, + }, }); const { getByTestId } = renderWithProvider(, store, ['/send']); @@ -89,6 +102,14 @@ describe('Routes Component', () => { ...mockSendState.send, stage: SEND_STAGES.EDIT, }, + metamask: { + ...mockSendState.metamask, + providerConfig: { + chainId: CHAIN_IDS.GOERLI, + nickname: GOERLI_DISPLAY_NAME, + type: NETWORK_TYPES.GOERLI, + }, + }, }); const { getByTestId } = renderWithProvider(, store, ['/send']); diff --git a/ui/pages/send/send-content/send-content.component.test.js b/ui/pages/send/send-content/send-content.component.test.js index 660ecf9bbdb2..340cf9709807 100644 --- a/ui/pages/send/send-content/send-content.component.test.js +++ b/ui/pages/send/send-content/send-content.component.test.js @@ -4,6 +4,11 @@ import configureMockStore from 'redux-mock-store'; import { renderWithProvider } from '../../../../test/lib/render-helpers'; import mockSendState from '../../../../test/data/mock-send-state.json'; +import { + NETWORK_TYPES, + CHAIN_IDS, + GOERLI_DISPLAY_NAME, +} from '../../../../shared/constants/network'; import SendContent from '.'; jest.mock('../../../store/actions', () => ({ @@ -17,7 +22,17 @@ jest.mock('../../../store/actions', () => ({ describe('SendContent Component', () => { describe('render', () => { - const mockStore = configureMockStore()(mockSendState); + const mockStore = configureMockStore()({ + ...mockSendState, + metamask: { + ...mockSendState.metamask, + providerConfig: { + chainId: CHAIN_IDS.GOERLI, + nickname: GOERLI_DISPLAY_NAME, + type: NETWORK_TYPES.GOERLI, + }, + }, + }); it('should match snapshot', async () => { const props = { @@ -59,6 +74,14 @@ describe('SendContent Component', () => { }, }, }, + metamask: { + ...mockSendState.metamask, + providerConfig: { + chainId: CHAIN_IDS.GOERLI, + nickname: GOERLI_DISPLAY_NAME, + type: NETWORK_TYPES.GOERLI, + }, + }, }; it('should not render the SendHexDataRow if props.showHexData is false', async () => { @@ -67,7 +90,17 @@ describe('SendContent Component', () => { showHexData: false, }; - const mockStore = configureMockStore()(mockSendState); + const mockStore = configureMockStore()({ + ...mockSendState, + metamask: { + ...mockSendState.metamask, + providerConfig: { + chainId: CHAIN_IDS.GOERLI, + nickname: GOERLI_DISPLAY_NAME, + type: NETWORK_TYPES.GOERLI, + }, + }, + }); const { queryByText } = renderWithProvider( , @@ -106,7 +139,17 @@ describe('SendContent Component', () => { showHexData: false, }; - const mockStore = configureMockStore()(mockSendState); + const mockStore = configureMockStore()({ + ...mockSendState, + metamask: { + ...mockSendState.metamask, + providerConfig: { + chainId: CHAIN_IDS.GOERLI, + nickname: GOERLI_DISPLAY_NAME, + type: NETWORK_TYPES.GOERLI, + }, + }, + }); const { queryByTestId } = renderWithProvider( , @@ -131,6 +174,11 @@ describe('SendContent Component', () => { metamask: { ...mockSendState.metamask, gasEstimateType: 'none', + providerConfig: { + chainId: CHAIN_IDS.GOERLI, + nickname: GOERLI_DISPLAY_NAME, + type: NETWORK_TYPES.GOERLI, + }, }, }; @@ -170,6 +218,15 @@ describe('SendContent Component', () => { }, }, }, + metamask: { + ...mockSendState.metamask, + gasEstimateType: 'none', + providerConfig: { + chainId: CHAIN_IDS.GOERLI, + nickname: GOERLI_DISPLAY_NAME, + type: NETWORK_TYPES.GOERLI, + }, + }, }; const mockStore = configureMockStore()(knownRecipientWarningState); @@ -208,6 +265,15 @@ describe('SendContent Component', () => { }, }, }, + metamask: { + ...mockSendState.metamask, + gasEstimateType: 'none', + providerConfig: { + chainId: CHAIN_IDS.GOERLI, + nickname: GOERLI_DISPLAY_NAME, + type: NETWORK_TYPES.GOERLI, + }, + }, }; const mockStore = configureMockStore()(assertErrorState); @@ -233,7 +299,17 @@ describe('SendContent Component', () => { warning: 'warning', }; - const mockStore = configureMockStore()(mockSendState); + const mockStore = configureMockStore()({ + ...mockSendState, + metamask: { + ...mockSendState.metamask, + providerConfig: { + chainId: CHAIN_IDS.GOERLI, + nickname: GOERLI_DISPLAY_NAME, + type: NETWORK_TYPES.GOERLI, + }, + }, + }); const { queryByTestId } = renderWithProvider( , diff --git a/ui/pages/send/send.test.js b/ui/pages/send/send.test.js index 591e499fc64e..794f3aa44d96 100644 --- a/ui/pages/send/send.test.js +++ b/ui/pages/send/send.test.js @@ -5,7 +5,11 @@ import { useLocation } from 'react-router-dom'; import { NetworkType } from '@metamask/controller-utils'; import { SEND_STAGES, startNewDraftTransaction } from '../../ducks/send'; import { domainInitialState } from '../../ducks/domains'; -import { CHAIN_IDS } from '../../../shared/constants/network'; +import { + CHAIN_IDS, + GOERLI_DISPLAY_NAME, + NETWORK_TYPES, +} from '../../../shared/constants/network'; import { renderWithProvider, setBackgroundConnection, @@ -242,6 +246,14 @@ describe('Send Page', () => { transactionCategory: 'approve', }, }, + metamask: { + ...baseStore.metamask, + providerConfig: { + chainId: CHAIN_IDS.GOERLI, + nickname: GOERLI_DISPLAY_NAME, + type: NETWORK_TYPES.GOERLI, + }, + }, }); const { getByText } = renderWithProvider(, store); expect(getByText('Send')).toBeTruthy(); @@ -280,6 +292,14 @@ describe('Send Page', () => { transactionCategory: 'approve', }, }, + metamask: { + ...baseStore.metamask, + providerConfig: { + chainId: CHAIN_IDS.GOERLI, + nickname: GOERLI_DISPLAY_NAME, + type: NETWORK_TYPES.GOERLI, + }, + }, }); const { getByText } = renderWithProvider(, store); expect(getByText('Next')).toBeTruthy(); From b649e4303775fcbfa18966054d4cce82e7243ae0 Mon Sep 17 00:00:00 2001 From: salimtb Date: Wed, 11 Oct 2023 09:56:47 +0200 Subject: [PATCH 091/219] fix: send tokens with decimals > 20 (#21147) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** Now MetaMask cannot send tokens with decimals larger than 20, this fix allows MetaMask to send tokens with tokens whose decimals <= 32. the solution was to config `bigNumber` and set decimals to 36 ## **Manual testing steps** 1 - Import token with decimals > 20 2 - Try to send an amount of this token using the send button ## **Screenshots/Recordings** ### **Before** https://github.com/MetaMask/metamask-extension/assets/26223211/b96d65b8-2373-49ee-ab11-ee737187d08d ### **After** https://github.com/MetaMask/metamask-extension/assets/26223211/afef0d44-b6a0-4b24-9880-084cd7ffa7d3 ## **Related issues** _Fixes #14481 ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [x] I’ve indicated what issue this PR is linked to: Fixes #??? - [x] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [x] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [x] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [x] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [x] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- app/scripts/controllers/swaps.test.js | 16 +++++++------- shared/modules/Numeric.test.ts | 31 ++++++++++++++++++++------- shared/modules/Numeric.ts | 2 ++ 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/app/scripts/controllers/swaps.test.js b/app/scripts/controllers/swaps.test.js index 56f5f5614758..f4765f1b3096 100644 --- a/app/scripts/controllers/swaps.test.js +++ b/app/scripts/controllers/swaps.test.js @@ -733,14 +733,14 @@ describe('SwapsController', function () { gasEstimateWithRefund: '0xb8cae', savings: { fee: '-0.061067', - metaMaskFee: '0.5050505050505050505', + metaMaskFee: '0.50505050505050505050505050505050505', performance: '6', - total: '5.4338824949494949495', - medianMetaMaskFee: '0.44444444444444444444', + total: '5.43388249494949494949494949494949495', + medianMetaMaskFee: '0.444444444444444444444444444444444444', }, ethFee: '0.113536', overallValueOfQuote: '49.886464', - metaMaskFeeInEth: '0.5050505050505050505', + metaMaskFeeInEth: '0.50505050505050505050505050505050505', ethValueOfTokens: '50', }); assert.strictEqual( @@ -798,15 +798,15 @@ describe('SwapsController', function () { gasEstimateWithRefund: '0xb8cae', savings: { fee: '-0.061067', - metaMaskFee: '0.5050505050505050505', + metaMaskFee: '0.50505050505050505050505050505050505', performance: '6', - total: '5.4338824949494949495', - medianMetaMaskFee: '0.44444444444444444444', + total: '5.43388249494949494949494949494949495', + medianMetaMaskFee: '0.444444444444444444444444444444444444', }, ethFee: '0.113822', multiLayerL1TradeFeeTotal: '0x0103c18816d4e8', overallValueOfQuote: '49.886178', - metaMaskFeeInEth: '0.5050505050505050505', + metaMaskFeeInEth: '0.50505050505050505050505050505050505', ethValueOfTokens: '50', }); assert.strictEqual( diff --git a/shared/modules/Numeric.test.ts b/shared/modules/Numeric.test.ts index 33e8f4ee217c..4123524dc41b 100644 --- a/shared/modules/Numeric.test.ts +++ b/shared/modules/Numeric.test.ts @@ -225,37 +225,37 @@ describe('Numeric', () => { it('should compute correct results for division of big numbers', () => { expect( new Numeric('175671432', 10).divide('686216', 10).toString(), - ).toStrictEqual('256.00019818832554181191'); + ).toStrictEqual('256.000198188325541811907620924023922497'); expect( new Numeric('1756714320', 10) .divide(new Numeric('686216', 10)) .toString(), - ).toStrictEqual('2560.00198188325541811908'); + ).toStrictEqual('2560.001981883255418119076209240239224967'); expect( new Numeric('41756714320', 10) .divide(new Numeric('6862160', 10)) .toString(), - ).toStrictEqual('6085.06859647691106007438'); + ).toStrictEqual('6085.068596476911060074378912762162351213'); }); it('should compute correct results for division of negative big numbers', () => { expect( new Numeric('175671432', 10).divide('-686216', 10).toString(), - ).toStrictEqual('-256.00019818832554181191'); + ).toStrictEqual('-256.000198188325541811907620924023922497'); expect( new Numeric('1756714320', 10) .divide(new Numeric('-686216', 10)) .toString(), - ).toStrictEqual('-2560.00198188325541811908'); + ).toStrictEqual('-2560.001981883255418119076209240239224967'); expect( new Numeric('-41756714320', 10) .divide(new Numeric('-6862160', 10)) .toString(), - ).toStrictEqual('6085.06859647691106007438'); + ).toStrictEqual('6085.068596476911060074378912762162351213'); }); }); @@ -377,7 +377,7 @@ describe('Numeric', () => { it('should multiply the value by the inverse of conversionRate supplied when second parameter is true', () => { expect( new Numeric(10, 10).applyConversionRate(468.5, true).toString(), - ).toStrictEqual('0.0213447171824973319'); + ).toStrictEqual('0.02134471718249733191035218783351121'); }); it('should multiply the value by the inverse of the BigNumber conversionRate supplied when second parameter is true', () => { @@ -385,7 +385,22 @@ describe('Numeric', () => { new Numeric(10, 10) .applyConversionRate(new BigNumber(468.5, 10), true) .toString(), - ).toStrictEqual('0.0213447171824973319'); + ).toStrictEqual('0.02134471718249733191035218783351121'); + }); + it('should not return 0 if decimals is greater than 20', () => { + expect( + new Numeric(10, 10) + .applyConversionRate(new BigNumber(1e27, 10), true) + .toString(), + ).toStrictEqual('0.00000000000000000000000001'); + }); + + it('should return 0 if decimals is greater than 32', () => { + expect( + new Numeric(10, 10) + .applyConversionRate(new BigNumber(1e40, 10), true) + .toString(), + ).toStrictEqual('0'); }); }); }); diff --git a/shared/modules/Numeric.ts b/shared/modules/Numeric.ts index e116fdfc7346..875f7b95d903 100644 --- a/shared/modules/Numeric.ts +++ b/shared/modules/Numeric.ts @@ -5,6 +5,8 @@ import { addHexPrefix } from 'ethereumjs-util'; import { EtherDenomination } from '../constants/common'; import { stripHexPrefix } from './hexstring-utils'; +const MAX_DECIMALS_FOR_TOKENS = 36; +BigNumber.config({ DECIMAL_PLACES: MAX_DECIMALS_FOR_TOKENS }); export type NumericValue = string | number | BN | BigNumber; export type NumericBase = 10 | 16; From ddbd9982848cba1e5c6648150795bbf78870a9fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= Date: Wed, 11 Oct 2023 09:50:52 +0100 Subject: [PATCH 092/219] [MMI] fix custody confirm link missing locale and variable (#21239) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** Adds a missing locale for MMI and looks for the correct property when finding a specific custodian. ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. ## **Pre-merge reviewer checklist** - [x] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [x] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- app/_locales/en/messages.json | 4 ++++ app/scripts/controllers/mmi-controller.js | 14 +++++++++----- .../custody-confirm-link-modal.js | 2 +- .../interactive-replacement-token-modal.js | 2 +- ui/pages/home/home.container.js | 4 ++-- ui/pages/institutional/custody/custody.js | 2 +- .../interactive-replacement-token-page.js | 2 +- .../interactive-replacement-token-page.test.js | 3 +++ 8 files changed, 22 insertions(+), 11 deletions(-) diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index cd61bd131378..b1fedcdb27d6 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -3212,6 +3212,10 @@ "onlyConnectTrust": { "message": "Only connect with sites you trust." }, + "openCustodianApp": { + "message": "Open $1 app", + "description": "The $1 is the name of the Custodian that will be open" + }, "openFullScreenForLedgerWebHid": { "message": "Go to full screen to connect your Ledger.", "description": "Shown to the user on the confirm screen when they are viewing MetaMask in a popup window but need to connect their ledger via webhid." diff --git a/app/scripts/controllers/mmi-controller.js b/app/scripts/controllers/mmi-controller.js index 969b26427a13..04affcf2c5be 100644 --- a/app/scripts/controllers/mmi-controller.js +++ b/app/scripts/controllers/mmi-controller.js @@ -442,8 +442,8 @@ export default class MMIController extends EventEmitter { } // Based on a custodian name, get all the tokens associated with that custodian - async getCustodianJWTList(custodianName) { - console.log('getCustodianJWTList', custodianName); + async getCustodianJWTList(custodianEnvName) { + console.log('getCustodianJWTList', custodianEnvName); const { identities } = this.preferencesController.store.getState(); @@ -455,7 +455,9 @@ export default class MMIController extends EventEmitter { const { custodians } = mmiConfiguration; - const custodian = custodians.find((item) => item.name === custodianName); + const custodian = custodians.find( + (item) => item.envName === custodianEnvName, + ); if (!custodian) { return []; @@ -480,9 +482,11 @@ export default class MMIController extends EventEmitter { if ( !custodyAccountDetails || - custodyAccountDetails.custodianName !== custodianName + custodyAccountDetails.custodianName !== custodianEnvName ) { - log.debug(`${address} does not belong to ${custodianName} keyring`); + log.debug( + `${address} does not belong to ${custodianEnvName} keyring`, + ); continue; } diff --git a/ui/components/institutional/custody-confirm-link-modal/custody-confirm-link-modal.js b/ui/components/institutional/custody-confirm-link-modal/custody-confirm-link-modal.js index 815c4b9bf65e..23f151a2b06d 100644 --- a/ui/components/institutional/custody-confirm-link-modal/custody-confirm-link-modal.js +++ b/ui/components/institutional/custody-confirm-link-modal/custody-confirm-link-modal.js @@ -49,7 +49,7 @@ const CustodyConfirmLink = ({ hideModal }) => { const { custodianName } = custodyAccountDetails[toChecksumHexAddress(address)] || {}; const { displayName, iconUrl } = - custodians.find((item) => item.name === custodianName) || {}; + custodians.find((item) => item.envName === custodianName) || {}; const { url, ethereum, text, action } = useSelector( (state) => state.appState.modal.modalState.props.link || {}, ); diff --git a/ui/components/institutional/interactive-replacement-token-modal/interactive-replacement-token-modal.js b/ui/components/institutional/interactive-replacement-token-modal/interactive-replacement-token-modal.js index 31359540d340..3dfa97aaf5a6 100644 --- a/ui/components/institutional/interactive-replacement-token-modal/interactive-replacement-token-modal.js +++ b/ui/components/institutional/interactive-replacement-token-modal/interactive-replacement-token-modal.js @@ -51,7 +51,7 @@ const InteractiveReplacementTokenModal = () => { const custodianName = custodyAccountDetails?.custodianName; const custodian = - custodians.find((item) => item.name === custodianName) || {}; + custodians.find((item) => item.envName === custodianName) || {}; const handleSubmit = () => { global.platform.openTab({ diff --git a/ui/pages/home/home.container.js b/ui/pages/home/home.container.js index 792d2b4947cb..db8b492fa2a3 100644 --- a/ui/pages/home/home.container.js +++ b/ui/pages/home/home.container.js @@ -5,9 +5,9 @@ import { withRouter } from 'react-router-dom'; import { getMmiPortfolioEnabled, getMmiPortfolioUrl, -} from '@metamask-institutional/portfolio-dashboard'; + getWaitForConfirmDeepLinkDialog, +} from '../../selectors/institutional/selectors'; import { mmiActionsFactory } from '../../store/institutional/institution-background'; -import { getWaitForConfirmDeepLinkDialog } from '../../selectors/institutional/selectors'; import { getInstitutionalConnectRequests } from '../../ducks/institutional/institutional'; ///: END:ONLY_INCLUDE_IN import { diff --git a/ui/pages/institutional/custody/custody.js b/ui/pages/institutional/custody/custody.js index c842b16d801e..6fba6e801ac5 100644 --- a/ui/pages/institutional/custody/custody.js +++ b/ui/pages/institutional/custody/custody.js @@ -263,7 +263,7 @@ const CustodyPage = () => { if (connectRequest && Object.keys(connectRequest).length) { const { token, - environment: custodianName, + environment: custodianName, // this is the env name service: custodianType, apiUrl: custodianApiUrl, } = connectRequest; diff --git a/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.js b/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.js index db0c2d5af4b6..e72b48f45021 100644 --- a/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.js +++ b/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.js @@ -63,7 +63,7 @@ export default function InteractiveReplacementTokenPage({ history }) { const { url } = interactiveReplacementToken || {}; const { custodians } = mmiConfiguration; const custodian = - custodians.find((item) => item.name === custodianName) || {}; + custodians.find((item) => item.envName === custodianName) || {}; const mostRecentOverviewPage = useSelector(getMostRecentOverviewPage); const metaMaskAccounts = useSelector(getMetaMaskAccounts); const connectRequests = useSelector( diff --git a/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.test.js b/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.test.js index a888b0a89032..f2c28b3eea66 100644 --- a/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.test.js +++ b/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.test.js @@ -14,6 +14,7 @@ const custodianAccounts = [ address: '0x9d0ba4ddac06032527b140912ec808ab9451b788', balance: '0x', name: 'Jupiter', + envName: 'Jupiter', labels: [ { key: 'service', @@ -25,6 +26,7 @@ const custodianAccounts = [ address: '0xeb9e64b93097bc15f01f13eae97015c57ab64823', balance: '0x', name: 'Jupiter', + envName: 'Jupiter', labels: [ { key: 'service', @@ -97,6 +99,7 @@ const render = ({ newState } = {}) => { { production: true, name: 'Jupiter', + envName: 'Jupiter', type: 'Jupiter', iconUrl: 'iconUrl', displayName: 'displayName', From ad494241a8cee89779525222822bfd8bd412093a Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Wed, 11 Oct 2023 11:42:15 +0200 Subject: [PATCH 093/219] Remove snap errors from home component (#21298) ## **Description** Removes the component that shows snaps errors in the home component. There is no functionality changes to test other than removed functionality. --- app/_locales/de/messages.json | 4 - app/_locales/el/messages.json | 4 - app/_locales/en/messages.json | 4 - app/_locales/es/messages.json | 4 - app/_locales/fr/messages.json | 4 - app/_locales/hi/messages.json | 4 - app/_locales/id/messages.json | 4 - app/_locales/ja/messages.json | 4 - app/_locales/ko/messages.json | 4 - app/_locales/pt/messages.json | 4 - app/_locales/ru/messages.json | 4 - app/_locales/tl/messages.json | 4 - app/_locales/tr/messages.json | 4 - app/_locales/vi/messages.json | 4 - app/_locales/zh_CN/messages.json | 4 - app/scripts/metamask-controller.js | 4 - test/e2e/snaps/test-snap-error.spec.js | 106 ------------------------- ui/pages/home/home.component.js | 47 ----------- ui/pages/home/home.container.js | 10 --- ui/store/actions.ts | 4 - 20 files changed, 231 deletions(-) delete mode 100644 test/e2e/snaps/test-snap-error.spec.js diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index 01aae5ed9120..764968de8fcd 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -3949,10 +3949,6 @@ "snapDetailsInstalled": { "message": "Installiert" }, - "snapError": { - "message": "Snap-Fehler: '$1'. Fehler-Code: '$2'", - "description": "This is shown when a snap encounters an error. $1 is the error message from the snap, and $2 is the error code." - }, "snapInstall": { "message": "Snap installieren" }, diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index 32c4f5fefca2..42c3d6cd7487 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -3949,10 +3949,6 @@ "snapDetailsInstalled": { "message": "Εγκαταστάθηκε" }, - "snapError": { - "message": "Σφάλμα Snap: '$1'. Κωδικός Σφάλματος: '$2'", - "description": "This is shown when a snap encounters an error. $1 is the error message from the snap, and $2 is the error code." - }, "snapInstall": { "message": "Εγκατάσταση του snap" }, diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index b1fedcdb27d6..9fa3bcea6877 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -4222,10 +4222,6 @@ "snapDetailsInstalled": { "message": "Installed" }, - "snapError": { - "message": "Snap Error: '$1'. Error Code: '$2'", - "description": "This is shown when a snap encounters an error. $1 is the error message from the snap, and $2 is the error code." - }, "snapInstall": { "message": "Install snap" }, diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 3fdd195c1954..3dd2740de760 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -3949,10 +3949,6 @@ "snapDetailsInstalled": { "message": "Instalado" }, - "snapError": { - "message": "Error de snap: '$1'. Código de error: '$2'", - "description": "This is shown when a snap encounters an error. $1 is the error message from the snap, and $2 is the error code." - }, "snapInstall": { "message": "Instalar snap" }, diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index 411087bc2a61..2d2a638b4b8a 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -3949,10 +3949,6 @@ "snapDetailsInstalled": { "message": "Installé" }, - "snapError": { - "message": "Erreur de snap : « $1 ». Code d’erreur : « $2 »", - "description": "This is shown when a snap encounters an error. $1 is the error message from the snap, and $2 is the error code." - }, "snapInstall": { "message": "Installer Snap" }, diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index d20ea4de1aab..2834bd054c56 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -3949,10 +3949,6 @@ "snapDetailsInstalled": { "message": "इंस्टॉल किया गया" }, - "snapError": { - "message": "Snap एरर: '$1'. एरर कोड: '$2'", - "description": "This is shown when a snap encounters an error. $1 is the error message from the snap, and $2 is the error code." - }, "snapInstall": { "message": "Snap इंस्टाल करें" }, diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index a50065f16d2e..c7f8a9b468bf 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -3949,10 +3949,6 @@ "snapDetailsInstalled": { "message": "Terinstal" }, - "snapError": { - "message": "Kesalahan Snap: '$1'. Kode Kesalahan: '$2'", - "description": "This is shown when a snap encounters an error. $1 is the error message from the snap, and $2 is the error code." - }, "snapInstall": { "message": "Instal Snap" }, diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index 1e12a4b479e6..1a656b5ec45c 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -3949,10 +3949,6 @@ "snapDetailsInstalled": { "message": "インストール済み" }, - "snapError": { - "message": "snapエラー:「$1」。エラーコード:「$2」", - "description": "This is shown when a snap encounters an error. $1 is the error message from the snap, and $2 is the error code." - }, "snapInstall": { "message": "snapをインストール" }, diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index 58e94e487ae1..a047ff34bc4c 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -3949,10 +3949,6 @@ "snapDetailsInstalled": { "message": "설치됨" }, - "snapError": { - "message": "스냅 오류: '$1'. 오류 코드: '$2'", - "description": "This is shown when a snap encounters an error. $1 is the error message from the snap, and $2 is the error code." - }, "snapInstall": { "message": "스냅 설치" }, diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index 37b377932deb..33f7c3d92b17 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -3949,10 +3949,6 @@ "snapDetailsInstalled": { "message": "Instalado" }, - "snapError": { - "message": "Erro no snap: '$1'. Código de erro: '$2'", - "description": "This is shown when a snap encounters an error. $1 is the error message from the snap, and $2 is the error code." - }, "snapInstall": { "message": "Instalar snap" }, diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index 723133dd98f3..eb89c8594173 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -3949,10 +3949,6 @@ "snapDetailsInstalled": { "message": "Установлена" }, - "snapError": { - "message": "Ошибка snap: '$1'. Код ошибки: '$2'", - "description": "This is shown when a snap encounters an error. $1 is the error message from the snap, and $2 is the error code." - }, "snapInstall": { "message": "Установить snap" }, diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json index 8c7b93eaa030..64d45fe62cc0 100644 --- a/app/_locales/tl/messages.json +++ b/app/_locales/tl/messages.json @@ -3949,10 +3949,6 @@ "snapDetailsInstalled": { "message": "Na-install" }, - "snapError": { - "message": "Snap Error: '$1'. Error Code: '$2'", - "description": "This is shown when a snap encounters an error. $1 is the error message from the snap, and $2 is the error code." - }, "snapInstall": { "message": "I-install ang snap" }, diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index 5e94764e5963..5547fc1462ed 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -3949,10 +3949,6 @@ "snapDetailsInstalled": { "message": "Yüklendi" }, - "snapError": { - "message": "Snap Hatası: '$1'. Hata Kodu: '$2'", - "description": "This is shown when a snap encounters an error. $1 is the error message from the snap, and $2 is the error code." - }, "snapInstall": { "message": "Snap yükle" }, diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index 379dc68ed227..04801fc95699 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -3949,10 +3949,6 @@ "snapDetailsInstalled": { "message": "Đã cài đặt" }, - "snapError": { - "message": "Lỗi Snap: \"$1\". Mã lỗi: \"$2\"", - "description": "This is shown when a snap encounters an error. $1 is the error message from the snap, and $2 is the error code." - }, "snapInstall": { "message": "Cài đặt Snap" }, diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index 622448434f62..02e27cc66ac0 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -3949,10 +3949,6 @@ "snapDetailsInstalled": { "message": "已安装" }, - "snapError": { - "message": "Snap错误：'$1'。错误代码：'$2'", - "description": "This is shown when a snap encounters an error. $1 is the error message from the snap, and $2 is the error code." - }, "snapInstall": { "message": "安装Snap" }, diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 2d3e9e7bfa7e..84731b6bb2fc 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -2797,10 +2797,6 @@ export default class MetamaskController extends EventEmitter { ///: BEGIN:ONLY_INCLUDE_IN(snaps) // snaps - removeSnapError: this.controllerMessenger.call.bind( - this.controllerMessenger, - 'SnapController:removeSnapError', - ), disableSnap: this.controllerMessenger.call.bind( this.controllerMessenger, 'SnapController:disable', diff --git a/test/e2e/snaps/test-snap-error.spec.js b/test/e2e/snaps/test-snap-error.spec.js deleted file mode 100644 index 9c19cd7234ec..000000000000 --- a/test/e2e/snaps/test-snap-error.spec.js +++ /dev/null @@ -1,106 +0,0 @@ -const { strict: assert } = require('assert'); -const { withFixtures } = require('../helpers'); -const FixtureBuilder = require('../fixture-builder'); -const { TEST_SNAPS_WEBSITE_URL } = require('./enums'); - -describe('Test Snap Error', function () { - it('can pop up a snap error and see the error', async function () { - const ganacheOptions = { - accounts: [ - { - secretKey: - '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC', - balance: 25000000000000000000, - }, - ], - }; - await withFixtures( - { - fixtures: new FixtureBuilder().build(), - ganacheOptions, - failOnConsoleError: false, - title: this.test.title, - }, - async ({ driver }) => { - await driver.navigate(); - - // enter pw into extension - await driver.fill('#password', 'correct horse battery staple'); - await driver.press('#password', driver.Key.ENTER); - - // navigate to test snaps page and connect - await driver.openNewPage(TEST_SNAPS_WEBSITE_URL); - await driver.delay(1000); - const snapButton = await driver.findElement('#connecterrors'); - await driver.scrollToElement(snapButton); - await driver.delay(1000); - await driver.clickElement('#connecterrors'); - await driver.delay(1000); - - // switch to metamask extension and click connect - const windowHandles = await driver.waitUntilXWindowHandles( - 3, - 1000, - 10000, - ); - const extensionPage = windowHandles[0]; - await driver.switchToWindowWithTitle( - 'MetaMask Notification', - windowHandles, - ); - await driver.clickElement({ - text: 'Connect', - tag: 'button', - }); - - await driver.waitForSelector({ text: 'Install' }); - - await driver.clickElement({ - text: 'Install', - tag: 'button', - }); - - await driver.waitForSelector({ text: 'OK' }); - - await driver.clickElement({ - text: 'OK', - tag: 'button', - }); - - // click send inputs on test snap page - await driver.switchToWindowWithTitle('Test Snaps', windowHandles); - - // wait for npm installation success - await driver.waitForSelector({ - css: '#connecterrors', - text: 'Reconnect to Errors Snap', - }); - - // find and click on send error - await driver.clickElement('#sendError'); - - // switch back to the extension page - await driver.switchToWindow(extensionPage); - await driver.delay(500); - - // look for the actual error and check if it is correct - const error = await driver.findElement( - '.home-notification__content-container', - ); - const text = await error.getText(); - assert.equal( - text.includes( - "Snap Error: 'Random error inside a promise.'. Error Code: '-32603'", - ), - true, - ); - - // try to click on the dismiss button and pass test if it works - await driver.clickElement({ - text: 'Dismiss', - tag: 'button', - }); - }, - ); - }); -}); diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js index cc23bf2d25ae..c54ca9e8cfbe 100644 --- a/ui/pages/home/home.component.js +++ b/ui/pages/home/home.component.js @@ -167,11 +167,6 @@ export default class Home extends PureComponent { pendingConfirmations: PropTypes.arrayOf(PropTypes.object).isRequired, hasApprovalFlows: PropTypes.bool.isRequired, infuraBlocked: PropTypes.bool.isRequired, - ///: BEGIN:ONLY_INCLUDE_IN(snaps) - errorsToShow: PropTypes.object.isRequired, - shouldShowErrors: PropTypes.bool.isRequired, - removeSnapError: PropTypes.func.isRequired, - ///: END:ONLY_INCLUDE_IN setRecoveryPhraseReminderHasBeenShown: PropTypes.func.isRequired, setRecoveryPhraseReminderLastShown: PropTypes.func.isRequired, setTermsOfUseLastAgreed: PropTypes.func.isRequired, @@ -412,11 +407,6 @@ export default class Home extends PureComponent { setWeb3ShimUsageAlertDismissed, originOfCurrentTab, disableWeb3ShimUsageAlert, - ///: BEGIN:ONLY_INCLUDE_IN(snaps) - removeSnapError, - errorsToShow, - shouldShowErrors, - ///: END:ONLY_INCLUDE_IN infuraBlocked, showOutdatedBrowserWarning, newNftAddedMessage, @@ -440,43 +430,6 @@ export default class Home extends PureComponent { return ( - { - ///: BEGIN:ONLY_INCLUDE_IN(snaps) - shouldShowErrors - ? Object.entries(errorsToShow).map(([errorId, error]) => { - return ( - - - {t('somethingWentWrong')} - - - {t('snapError', [error.message, error.code])} - - - } - onIgnore={async () => { - await removeSnapError(errorId); - }} - ignoreText="Dismiss" - key="home-error-message" - /> - ); - }) - : null - ///: END:ONLY_INCLUDE_IN - } {newNftAddedMessage === 'success' ? ( { pendingConfirmations, infuraBlocked: getInfuraBlocked(state), announcementsToShow: getSortedAnnouncementsToShow(state).length > 0, - ///: BEGIN:ONLY_INCLUDE_IN(snaps) - errorsToShow: metamask.snapErrors, - shouldShowErrors: Object.entries(metamask.snapErrors || []).length > 0, - ///: END:ONLY_INCLUDE_IN showWhatsNewPopup: getShowWhatsNewPopup(state), showRecoveryPhraseReminder: getShowRecoveryPhraseReminder(state), showTermsOfUsePopup: getShowTermsOfUse(state), @@ -188,9 +181,6 @@ const mapDispatchToProps = (dispatch) => { return { closeNotificationPopup: () => closeNotificationPopup(), - ///: BEGIN:ONLY_INCLUDE_IN(snaps) - removeSnapError: async (id) => await removeSnapError(id), - ///: END:ONLY_INCLUDE_IN setConnectedStatusPopoverHasBeenShown: () => dispatch(setConnectedStatusPopoverHasBeenShown()), onTabClick: (name) => dispatch(setDefaultHomeActiveTabName(name)), diff --git a/ui/store/actions.ts b/ui/store/actions.ts index 5508c0ed4cdf..2c7a29dd8690 100644 --- a/ui/store/actions.ts +++ b/ui/store/actions.ts @@ -1195,10 +1195,6 @@ export function removeSnap( }; } -export async function removeSnapError(msgData: string): Promise { - return submitRequestToBackground('removeSnapError', [msgData]); -} - export async function handleSnapRequest(args: { snapId: string; origin: string; From 3d780ce009058097358198af9924191cda86cb22 Mon Sep 17 00:00:00 2001 From: Monte Lai Date: Wed, 11 Oct 2023 20:28:26 +0800 Subject: [PATCH 094/219] fix: center messages for loading spinner (#21319) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This PR centers the text that is displayed under the loading spinner ## **Manual testing steps** 1. Click on send using a ledger account 2. Enter any amount and click next 3. Confirm the transaction 4. See the loading message ## **Screenshots/Recordings** ### **Before** ![image](https://github.com/MetaMask/metamask-extension/assets/96463427/747bf578-5d3a-46f5-8c6f-14489b67780c) ### **After** ![Screenshot 2023-10-11 at 17 36 58](https://github.com/MetaMask/metamask-extension/assets/96463427/945a59d7-2944-4c4e-ac4b-a26f23d49273) ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [x] I’ve included tests if applicable. - [x] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [x] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [x] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- .../loading-screen/loading-screen.component.js | 17 +++++++++++++++-- .../confirm-transaction.test.js.snap | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ui/components/ui/loading-screen/loading-screen.component.js b/ui/components/ui/loading-screen/loading-screen.component.js index 6461b89aaf8c..d8a42c33b78e 100644 --- a/ui/components/ui/loading-screen/loading-screen.component.js +++ b/ui/components/ui/loading-screen/loading-screen.component.js @@ -2,6 +2,12 @@ import React, { isValidElement } from 'react'; import PropTypes from 'prop-types'; import Spinner from '../spinner'; import { Box } from '../../component-library'; +import { + AlignItems, + Display, + FlexDirection, + JustifyContent, +} from '../../../helpers/constants/design-system'; const LoadingScreen = ({ header, @@ -16,7 +22,7 @@ const LoadingScreen = ({ return isValidElement(loadingMessage) ? ( loadingMessage ) : ( - {loadingMessage} + {loadingMessage} ); }; @@ -31,7 +37,14 @@ const LoadingScreen = ({ /> )} - {renderMessage()} + + {renderMessage()} + ); }; diff --git a/ui/pages/confirm-transaction/__snapshots__/confirm-transaction.test.js.snap b/ui/pages/confirm-transaction/__snapshots__/confirm-transaction.test.js.snap index e120b674d476..b933455f761a 100644 --- a/ui/pages/confirm-transaction/__snapshots__/confirm-transaction.test.js.snap +++ b/ui/pages/confirm-transaction/__snapshots__/confirm-transaction.test.js.snap @@ -276,7 +276,7 @@ exports[`Confirmation Transaction Page should display the Loading component when
`; From 138e6d7b9c7b99017b4a7c448ce57eefb5dd9928 Mon Sep 17 00:00:00 2001 From: Monte Lai Date: Wed, 11 Oct 2023 21:33:25 +0800 Subject: [PATCH 095/219] fix: keyring snap removal modal flashing regular modal (#21299) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This PR fixes the condition when Snap Accounts that take time to be removed causes the default snap removal modal to be shown. ## **Manual testing steps** 1. Start metamask flask 2. Install [Snap Simple Keyring version 0.2.2](https://metamask.github.io/snap-simple-keyring/0.2.2/) 3. Create an account 4. On the metamask extension, click on settings 5. Click on snaps 6. Select the Snap Simple Keyring 7. Click on `Remove Metamask Snap Simple Keyring` 8. Click `Continue` 9. Enter the snap name and click `Remove Snap` 10. See that the default snap removal modal does not appear ## **Related issues** Resolves https://github.com/MetaMask/accounts-planning/issues/101 ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [x] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [x] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [x] I’ve properly set the pull request status: - [x] In case it's not yet "ready for review", I've set it to "draft". - [x] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- ui/pages/settings/snaps/view-snap/view-snap.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ui/pages/settings/snaps/view-snap/view-snap.js b/ui/pages/settings/snaps/view-snap/view-snap.js index 8f364c5c74c7..9f4e39f1cb90 100644 --- a/ui/pages/settings/snaps/view-snap/view-snap.js +++ b/ui/pages/settings/snaps/view-snap/view-snap.js @@ -66,6 +66,8 @@ function ViewSnap() { const [isShowingRemoveWarning, setIsShowingRemoveWarning] = useState(false); const [isDescriptionOpen, setIsDescriptionOpen] = useState(false); const [isOverflowing, setIsOverflowing] = useState(false); + // eslint-disable-next-line no-unused-vars -- Main build does not use setIsRemovingKeyringSnap + const [isRemovingKeyringSnap, setIsRemovingKeyringSnap] = useState(false); // eslint-disable-next-line no-unused-vars -- Main build does not use setKeyringAccounts const [keyringAccounts, setKeyringAccounts] = useState([]); @@ -230,7 +232,8 @@ function ViewSnap() { setIsShowingRemoveWarning(false)} onSubmit={async () => { @@ -250,6 +253,7 @@ function ViewSnap() { onBack={() => setIsShowingRemoveWarning(false)} onSubmit={async () => { try { + setIsRemovingKeyringSnap(true); await dispatch(removeSnap(snap.id)); setIsShowingRemoveWarning(false); dispatch( @@ -266,6 +270,8 @@ function ViewSnap() { result: KeyringSnapRemovalResultStatus.Failed, }), ); + } finally { + setIsRemovingKeyringSnap(false); } }} isOpen={ From 082d3824412c8b9d47e7f5fd459fca8e89008d36 Mon Sep 17 00:00:00 2001 From: Jyoti Puri Date: Wed, 11 Oct 2023 19:04:43 +0530 Subject: [PATCH 096/219] It should not be possible for user to enable both openSea and blockaid security providers (#21151) --- .../experimental-tab.component.js | 76 +++++++++++++------ .../experimental-tab/experimental-tab.test.js | 53 ++++++++++++- 2 files changed, 101 insertions(+), 28 deletions(-) diff --git a/ui/pages/settings/experimental-tab/experimental-tab.component.js b/ui/pages/settings/experimental-tab/experimental-tab.component.js index 57fb48ad63a2..1bb39c6ba8aa 100644 --- a/ui/pages/settings/experimental-tab/experimental-tab.component.js +++ b/ui/pages/settings/experimental-tab/experimental-tab.component.js @@ -40,8 +40,8 @@ export default class ExperimentalTab extends PureComponent { static propTypes = { transactionSecurityCheckEnabled: PropTypes.bool, setTransactionSecurityCheckEnabled: PropTypes.func, - ///: BEGIN:ONLY_INCLUDE_IN(blockaid) securityAlertsEnabled: PropTypes.bool, + ///: BEGIN:ONLY_INCLUDE_IN(blockaid) setSecurityAlertsEnabled: PropTypes.func, ///: END:ONLY_INCLUDE_IN ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) @@ -71,16 +71,62 @@ export default class ExperimentalTab extends PureComponent { handleSettingsRefs(t, t('experimental'), this.settingsRefs); } + ///: BEGIN:ONLY_INCLUDE_IN(blockaid) + /** + * toggleSecurityAlert + * + * @param {boolean} oldValue - the current securityAlertEnabled value. + */ + toggleSecurityAlert(oldValue) { + const newValue = !oldValue; + const { setSecurityAlertsEnabled, transactionSecurityCheckEnabled } = + this.props; + this.context.trackEvent({ + category: MetaMetricsEventCategory.Settings, + event: 'Enabled/Disable security_alerts_enabled', + properties: { + action: 'Enabled/Disable security_alerts_enabled', + legacy_event: true, + }, + }); + setSecurityAlertsEnabled(newValue); + if (newValue && transactionSecurityCheckEnabled) { + this.toggleTransactionSecurityCheck(true); + } + } + ///: END:ONLY_INCLUDE_IN + + /** + * toggleTransactionSecurityCheck + * + * @param {boolean} oldValue - the current transactionSecurityCheckEnabled value. + */ + toggleTransactionSecurityCheck(oldValue) { + const newValue = !oldValue; + const { securityAlertsEnabled, setTransactionSecurityCheckEnabled } = + this.props; + this.context.trackEvent({ + category: MetaMetricsEventCategory.Settings, + event: 'Enabled/Disable TransactionSecurityCheck', + properties: { + action: 'Enabled/Disable TransactionSecurityCheck', + legacy_event: true, + }, + }); + setTransactionSecurityCheckEnabled(newValue); + if (newValue && securityAlertsEnabled && this.toggleSecurityAlert) { + this.toggleSecurityAlert(true); + } + } + renderSecurityAlertsToggle() { const { t } = this.context; const { ///: BEGIN:ONLY_INCLUDE_IN(blockaid) securityAlertsEnabled, - setSecurityAlertsEnabled, ///: END:ONLY_INCLUDE_IN transactionSecurityCheckEnabled, - setTransactionSecurityCheckEnabled, } = this.props; return ( @@ -143,17 +189,7 @@ export default class ExperimentalTab extends PureComponent {
{ - this.context.trackEvent({ - category: MetaMetricsEventCategory.Settings, - event: 'Enabled/Disable security_alerts_enabled', - properties: { - action: 'Enabled/Disable security_alerts_enabled', - legacy_event: true, - }, - }); - setSecurityAlertsEnabled(!value || false); - }} + onToggle={this.toggleSecurityAlert.bind(this)} />
@@ -182,17 +218,7 @@ export default class ExperimentalTab extends PureComponent {
{ - this.context.trackEvent({ - category: MetaMetricsEventCategory.Settings, - event: 'Enabled/Disable TransactionSecurityCheck', - properties: { - action: 'Enabled/Disable TransactionSecurityCheck', - legacy_event: true, - }, - }); - setTransactionSecurityCheckEnabled(!value); - }} + onToggle={this.toggleTransactionSecurityCheck.bind(this)} />
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.test.js b/ui/pages/settings/experimental-tab/experimental-tab.test.js index c9a2aabb2302..0c35d035d279 100644 --- a/ui/pages/settings/experimental-tab/experimental-tab.test.js +++ b/ui/pages/settings/experimental-tab/experimental-tab.test.js @@ -1,17 +1,22 @@ import React from 'react'; -import { renderWithProvider } from '../../../../test/jest'; +import { fireEvent, renderWithProvider } from '../../../../test/jest'; import configureStore from '../../../store/store'; import mockState from '../../../../test/data/mock-state.json'; +import { LegacyMetaMetricsProvider } from '../../../contexts/metametrics'; import ExperimentalTab from './experimental-tab.component'; -const render = (overrideMetaMaskState) => { +const render = (overrideMetaMaskState, props = {}) => { const store = configureStore({ metamask: { ...mockState.metamask, ...overrideMetaMaskState, }, }); - return renderWithProvider(, store); + const comp = ; + return renderWithProvider( + {comp}, + store, + ); }; describe('ExperimentalTab', () => { @@ -27,4 +32,46 @@ describe('ExperimentalTab', () => { expect(container).toMatchSnapshot(); }); }); + + it('should render multiple toggle options', () => { + const { getAllByRole } = render({ desktopEnabled: true }); + const toggle = getAllByRole('checkbox'); + expect(toggle).toHaveLength(3); + }); + + it('should disable opensea when blockaid is enabled', () => { + const setSecurityAlertsEnabled = jest.fn(); + const setTransactionSecurityCheckEnabled = jest.fn(); + const { getAllByRole } = render( + { desktopEnabled: true }, + { + securityAlertsEnabled: false, + transactionSecurityCheckEnabled: true, + setSecurityAlertsEnabled, + setTransactionSecurityCheckEnabled, + }, + ); + const toggle = getAllByRole('checkbox'); + fireEvent.click(toggle[0]); + expect(setSecurityAlertsEnabled).toHaveBeenCalledWith(true); + expect(setTransactionSecurityCheckEnabled).toHaveBeenCalledWith(false); + }); + + it('should disable blockaid when opensea is enabled', () => { + const setSecurityAlertsEnabled = jest.fn(); + const setTransactionSecurityCheckEnabled = jest.fn(); + const { getAllByRole } = render( + { desktopEnabled: true }, + { + transactionSecurityCheckEnabled: false, + securityAlertsEnabled: true, + setSecurityAlertsEnabled, + setTransactionSecurityCheckEnabled, + }, + ); + const toggle = getAllByRole('checkbox'); + fireEvent.click(toggle[1]); + expect(setTransactionSecurityCheckEnabled).toHaveBeenCalledWith(true); + expect(setSecurityAlertsEnabled).toHaveBeenCalledWith(false); + }); }); From 0ad376844db5cf0d2f06b73c197d00428acb5e1e Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Wed, 11 Oct 2023 11:15:53 -0230 Subject: [PATCH 097/219] v11.3.0 --- CHANGELOG.md | 8 +++++++- package.json | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50cee8c83041..155b0eb5ff36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [11.3.0] + +## [11.2.0] + ## [11.1.0] ### Added - What's New popup on dropping of support for Ledger support for firefox ([#19498](https://github.com/MetaMask/metamask-extension/pull/19498)) @@ -4035,7 +4039,9 @@ Update styles and spacing on the critical error page ([#20350](https://github.c ### Uncategorized - Added the ability to restore accounts from seed words. -[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.1.0...HEAD +[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.3.0...HEAD +[11.3.0]: https://github.com/MetaMask/metamask-extension/compare/v11.2.0...v11.3.0 +[11.2.0]: https://github.com/MetaMask/metamask-extension/compare/v11.1.0...v11.2.0 [11.1.0]: https://github.com/MetaMask/metamask-extension/compare/v11.0.0...v11.1.0 [11.0.0]: https://github.com/MetaMask/metamask-extension/compare/v10.35.1...v11.0.0 [10.35.1]: https://github.com/MetaMask/metamask-extension/compare/v10.35.0...v10.35.1 diff --git a/package.json b/package.json index 4ff01e9f53aa..588a0831946e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask-crx", - "version": "11.1.0", + "version": "11.3.0", "private": true, "repository": { "type": "git", From 7d1c36068e762a1fe21de7b78c8cb9b6385b591b Mon Sep 17 00:00:00 2001 From: Olusegun Akintayo Date: Wed, 11 Oct 2023 14:46:38 +0100 Subject: [PATCH 098/219] fix: Error prompt when canceling a transaction (#21269) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** Error is prompted in the console when attempting to cancel a transaction and transaction is not cancelled. The error comes from a call to selector where we are passing in `state.metamask` object instead of state object. To fix, we pass in an object where `metamask` is a property and value is `state.metamask` ## **Expected behavior** No errors are shown and transaction is cancelled. ## **Manual testing steps** 1. Open MetaMask and enter your password 2. Switch to a test network: e.g. Goerli 3. Proceed to the send flow 4. Send 0.1 ETH to an address: e.g. 0x3D0b9b4056D86f8d9889B2C8e26FFCedC62D3036 5. Edit the gas settings in Market --> Advanced: Max base fee to 0.0000001 and Priority Fee to 0.0000001 6. Confirm the transaction 7. Cancel transaction ## **Screenshots/Recordings** ### **Before** https://github.com/MetaMask/metamask-extension/assets/120041701/d371c902-b0bb-4e52-b152-549f1a487375 ### **After** https://github.com/MetaMask/metamask-extension/assets/44811/40dd2071-a9ca-4d31-9241-dfc76aaacd9f ## **Related issues** _Fixes #21261 ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [x] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [x] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [x] I’ve properly set the pull request status: - [x] In case it's not yet "ready for review", I've set it to "draft". - [x] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. Signed-off-by: Akintayo A. Olusegun --- ui/store/actions.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/store/actions.ts b/ui/store/actions.ts index 2c7a29dd8690..057027c2f15a 100644 --- a/ui/store/actions.ts +++ b/ui/store/actions.ts @@ -2080,8 +2080,9 @@ export function createCancelTransaction( return; } if (newState) { - const currentNetworkTxList = - getCurrentNetworkTransactions(newState); + const currentNetworkTxList = getCurrentNetworkTransactions({ + metamask: newState, + }); const { id } = currentNetworkTxList[currentNetworkTxList.length - 1]; newTxId = id; From 6d793cfb32e354f777f45fa3c48616feed74f6ef Mon Sep 17 00:00:00 2001 From: David Drazic Date: Wed, 11 Oct 2023 16:13:16 +0200 Subject: [PATCH 099/219] Update transaction insights dropdown (#21231) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This PR updates Transaction Insights dropdown mechanics. Old custom dropdown component and its functionality is replaced with [design system dropdown](https://metamask.github.io/metamask-storybook/?path=/docs/components-ui-dropdown--docs). `DropdownTab` is still in use as a wrapper in order to achieve the same behaviour as the other tabs have and to also embed transaction insights content properly. Other redundant code for previous dropdown implementation is removed. ## **Manual testing steps** 1. Install few transaction insight Snaps. 2. Go to test dapp and try sending a transaction. 3. Check the Transaction Insights tab and its functionality. ## **Screenshots/Recordings** ### **Before** ![image](https://github.com/MetaMask/metamask-extension/assets/13301024/e6c0f954-b81c-43c5-af9f-d6fa50ead52b) ![image](https://github.com/MetaMask/metamask-extension/assets/13301024/2c5a4b23-b41d-45fa-80b7-f44bb0eb845b) ### **After** Chrome: ![Screenshot 2023-10-09 at 11 41 46](https://github.com/MetaMask/metamask-extension/assets/13301024/5dfb70c8-0f69-4875-92b2-bf343e633a6d) ![Screenshot 2023-10-09 at 11 42 01](https://github.com/MetaMask/metamask-extension/assets/13301024/6128beb4-548b-4345-b184-0063d0ae1052) ![Screenshot 2023-10-09 at 11 42 52](https://github.com/MetaMask/metamask-extension/assets/13301024/b5018551-a760-4aec-8ee2-b62a4851ddf9) ![Screenshot 2023-10-10 at 23 52 32](https://github.com/MetaMask/metamask-extension/assets/13301024/40e15275-ec20-4fde-ac3c-241f9239c90e) Firefox: ![Screenshot 2023-10-09 at 11 44 12](https://github.com/MetaMask/metamask-extension/assets/13301024/7cf99129-0925-403c-8f29-6fe856e84749) ## **Related issues** Fixes: https://github.com/MetaMask/metamask-extension/issues/21024 ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've clearly explained: - [ ] What problem this PR is solving. - [ ] How this problem was solved. - [ ] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- .../tabs/snaps/dropdown-tab/dropdown-tab.js | 111 +++++------------- .../snaps/dropdown-tab/dropdown-tab.test.js | 14 +-- .../ui/tabs/snaps/dropdown-tab/index.scss | 55 +++++++++ ui/components/ui/ui-components.scss | 1 + 4 files changed, 90 insertions(+), 91 deletions(-) create mode 100644 ui/components/ui/tabs/snaps/dropdown-tab/index.scss diff --git a/ui/components/ui/tabs/snaps/dropdown-tab/dropdown-tab.js b/ui/components/ui/tabs/snaps/dropdown-tab/dropdown-tab.js index b3dc61fa4920..a5d503834f63 100644 --- a/ui/components/ui/tabs/snaps/dropdown-tab/dropdown-tab.js +++ b/ui/components/ui/tabs/snaps/dropdown-tab/dropdown-tab.js @@ -2,24 +2,12 @@ import React, { useCallback, useEffect, useRef, useState } from 'react'; import PropTypes from 'prop-types'; import classnames from 'classnames'; import { - AlignItems, BlockSize, - BackgroundColor, - BorderColor, - BorderRadius, - BorderStyle, - Display, FlexDirection, FlexWrap, - TextVariant, } from '../../../../../helpers/constants/design-system'; -import { - Box, - Icon, - IconName, - IconSize, - Text, -} from '../../../../component-library'; +import { Box } from '../../../../component-library'; +import Dropdown from '../../../dropdown'; export const DropdownTab = ({ activeClassName, @@ -37,19 +25,12 @@ export const DropdownTab = ({ const dropdownRef = useRef(null); const selectOption = useCallback( - (event, option) => { - event.stopPropagation(); - onChange(option.value); - setIsOpen(false); + (option) => { + onChange(option); }, [onChange], ); - const openDropdown = (event) => { - event.preventDefault(); - setIsOpen(true); - }; - const onTabClick = (event) => { event.preventDefault(); onClick(tabIndex); @@ -79,74 +60,38 @@ export const DropdownTab = ({ return ( - - - {selectedOptionName} - - - - - - {isOpen && ( - - {options.map((option, i) => ( - selectOption(event, option)} - style={{ - cursor: 'pointer', - textTransform: 'none', - whiteSpace: 'nowrap', - overflow: 'hidden', - textOverflow: 'ellipsis', - }} - > - {option.name} - - ))} - - )} + selectOption(option)} + options={options} + selectedOption={selectedOption} + title="Transaction Insights" + style={{ + pointerEvents: isActive ? 'auto' : 'none', + }} + /> ); }; diff --git a/ui/components/ui/tabs/snaps/dropdown-tab/dropdown-tab.test.js b/ui/components/ui/tabs/snaps/dropdown-tab/dropdown-tab.test.js index ba0fb4d8c812..6708fb11c80c 100644 --- a/ui/components/ui/tabs/snaps/dropdown-tab/dropdown-tab.test.js +++ b/ui/components/ui/tabs/snaps/dropdown-tab/dropdown-tab.test.js @@ -17,6 +17,7 @@ describe('DropdownTab', () => { selectedOption: 'foo', onChange, onClick, + isActive: true, }; }); it('should render the DropdownTab component without crashing', () => { @@ -34,16 +35,13 @@ describe('DropdownTab', () => { }); it('registers selection', () => { - const { container, getByText } = render(); - - // Find the clickable element (icon box) in the dropdown that contains - // ArrowDown icon by walking the nested elements - const clickableIconBox = container.firstChild.firstChild.lastChild; - fireEvent.click(clickableIconBox); + const { container } = render(); - const element = getByText(args.options[1].name); + // Find the clickable combobox element nested inside the rendered component + const combobox = container.firstChild.firstChild.firstChild; + fireEvent.click(combobox); - fireEvent.click(element); + fireEvent.change(combobox, { target: { value: args.options[1].value } }); expect(onClick).toHaveBeenCalledWith(args.tabIndex); expect(onChange).toHaveBeenCalledWith(args.options[1].value); diff --git a/ui/components/ui/tabs/snaps/dropdown-tab/index.scss b/ui/components/ui/tabs/snaps/dropdown-tab/index.scss new file mode 100644 index 000000000000..6ce771f204e2 --- /dev/null +++ b/ui/components/ui/tabs/snaps/dropdown-tab/index.scss @@ -0,0 +1,55 @@ +%select-box-padding { + padding: 8px 20px 0 4px; +} + +%select-box-text-styles { + font-size: 0.75rem; + overflow: hidden !important; + white-space: nowrap; + text-overflow: ellipsis; +} + +.transaction-insight-dropdown-wrapper { + &::before { + @extend %select-box-padding; + @extend %select-box-text-styles; + + content: attr(title); + visibility: hidden; + pointer-events: none; + display: inline-block; + max-width: 150px; + } +} + +.transaction-insight-dropdown { + cursor: pointer; + + &, + select { + position: absolute; + top: 0; + left: 0; + right: 0; + } + + select { + @extend %select-box-text-styles; + + border: none; + cursor: pointer; + } + + select:focus { + outline: none; + } + + .dropdown__icon-caret-down { + right: 4px; + cursor: pointer; + } + + .dropdown__select { + @extend %select-box-padding; + } +} diff --git a/ui/components/ui/ui-components.scss b/ui/components/ui/ui-components.scss index 20d90b2826f6..a16a99dcf5e4 100644 --- a/ui/components/ui/ui-components.scss +++ b/ui/components/ui/ui-components.scss @@ -45,6 +45,7 @@ @import 'site-origin/index'; @import 'slider/index'; @import 'tabs/index'; +@import 'tabs/snaps/dropdown-tab/index.scss'; @import 'text-field/index'; @import 'toggle-button/index'; @import 'token-balance/index'; From 44000c27d807480153884af33de1e87f6320b26e Mon Sep 17 00:00:00 2001 From: sahar-fehri Date: Wed, 11 Oct 2023 17:29:26 +0200 Subject: [PATCH 100/219] fix: reset asset state on selectAccountChanged (#21264) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This PR fixes two issues mentioned here: https://github.com/MetaMask/metamask-extension/issues/15836 https://github.com/MetaMask/metamask-extension/issues/14684 Currently, if you are sending an ERC20 token on one account. And then you switch to another account that does not have that entered amount, Metamask still allows for the transaction to be confirmed which will fail eventually. The current fix resets the "asset" field in the state to the native currency when the user changes the selected account. ## **Manual testing steps** Make sure you have two accounts with any ERC20 tokens, (in our exp: USDC) _1. Click on the ERC20 token, USDC, and click on "send" _2. If you have for exp 102 USDC, put in the amount field "100" _3. Switch the account to another account that does not have the entered amount, and you should see in assets the native currency exp "ETH" instead of "USDC" and the amount should be back to zero. ## **Screenshots/Recordings** _If applicable, add screenshots and/or recordings to visualize the before and after of your change._ ### **Before** In this test, we have two accounts; one with 102 USDC the other with 20 USDC. We will start with account 3 and attempt to send 100 USDC to another account: ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/f4d55f03-a2a2-4bbc-b2a9-890dc4a20050) Switch to another account that does not have the required amount ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/b1370e99-f48a-4038-a403-b210c89dc267) Notice that there is no confirmation of the amount and you can click on confirm ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/bb0a9631-68af-4d81-8037-56c9c0d6c1de) ### **After** ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/bfa5082f-6f88-473b-9ef8-189c1d93e0f7) Switch to another account ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/90e9cd7f-d94e-4b1b-848d-97e341435dea) Notice that we have now the native currency ETH selected and if you attempt now to send more USDC than what you have ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/97783977-9640-432f-aa00-80412ed07d12) ## **Related issues** [_Fixes #MMASSETS-41](https://consensyssoftware.atlassian.net/browse/MMASSETS-41) ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [ ] What problem this PR is solving. - [ ] How this problem was solved. - [ ] How reviewers can test my changes. - [x] I’ve indicated what issue this PR is linked to: Fixes #??? - [x] I’ve included tests if applicable. - [x] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- ui/ducks/send/send.js | 13 +++++++++++ ui/ducks/send/send.test.js | 47 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/ui/ducks/send/send.js b/ui/ducks/send/send.js index 4af8d9bb8a9b..58d45c780367 100644 --- a/ui/ducks/send/send.js +++ b/ui/ducks/send/send.js @@ -1636,6 +1636,19 @@ const slice = createSlice({ if (draftTransaction?.asset.type === AssetType.native) { draftTransaction.asset.balance = action.payload.account.balance; } + + // If selected account was changed and selected asset is a token then + // reset asset to native asset + if (draftTransaction?.asset.type === AssetType.token) { + draftTransaction.asset.type = + draftTransactionInitialState.asset.type; + draftTransaction.asset.error = + draftTransactionInitialState.asset.error; + draftTransaction.asset.details = + draftTransactionInitialState.asset.details; + draftTransaction.asset.balance = action.payload.account.balance; + } + slice.caseReducers.validateAmountField(state); slice.caseReducers.validateGasField(state); slice.caseReducers.validateSendState(state); diff --git a/ui/ducks/send/send.test.js b/ui/ducks/send/send.test.js index 4835c4d43079..a7cf6c22c6b6 100644 --- a/ui/ducks/send/send.test.js +++ b/ui/ducks/send/send.test.js @@ -1143,6 +1143,53 @@ describe('Send Slice', () => { action.payload.account.address, ); }); + it('should reset to native asset on selectedAccount changed', () => { + const olderState = { + ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT, + selectedAccount: { + balance: '0x3', + address: mockAddress1, + }, + draftTransactions: { + 'test-uuid': { + ...draftTransactionInitialState, + asset: { + type: AssetType.token, + error: null, + details: { + address: 'tokenAddress', + symbol: 'tokenSymbol', + decimals: 'tokenDecimals', + }, + balance: '0x2', + }, + }, + }, + }; + + const action = { + type: 'SELECTED_ACCOUNT_CHANGED', + payload: { + account: { + address: '0xDifferentAddress', + balance: '0x1', + }, + }, + }; + + const result = sendReducer(olderState, action); + expect(result.selectedAccount.balance).toStrictEqual( + action.payload.account.balance, + ); + expect(result.selectedAccount.address).toStrictEqual( + action.payload.account.address, + ); + + expect(result.draftTransactions['test-uuid'].asset).toStrictEqual({ + ...draftTransactionInitialState.asset, + balance: action.payload.account.balance, + }); + }); it('should gracefully handle missing account in payload', () => { const olderState = { From b60a2510a191fd816ce1047640bf7e4199c177fd Mon Sep 17 00:00:00 2001 From: David Walsh Date: Wed, 11 Oct 2023 10:30:09 -0500 Subject: [PATCH 101/219] UX: Multichain: Fix AccountPicker Padding when Address Showing (#21251) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** The `ButtonBase` component has a default size of `Md`. Since we recently started showing the address within the `AccountPicker`, the contents have gotten taller which has eliminated some padding. This PR adds more vertical padding when the address is displaying. ## **Manual testing steps** 1. See no change on regular `yarn start` 2. Start the extension with `MULTICHAIN=1 yarn start` 3. See more padding on the `AccountPicker` ## **Screenshots/Recordings** ### **Before** SCR-20231008-rzmt ### **After** SCR-20231008-rzuq ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've clearly explained: - [ ] What problem this PR is solving. - [ ] How this problem was solved. - [ ] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- ui/components/multichain/account-picker/account-picker.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/components/multichain/account-picker/account-picker.js b/ui/components/multichain/account-picker/account-picker.js index 278f0b54d7c9..cc46c938a826 100644 --- a/ui/components/multichain/account-picker/account-picker.js +++ b/ui/components/multichain/account-picker/account-picker.js @@ -10,6 +10,7 @@ import { IconName, Text, ButtonBase, + ButtonBaseSize, } from '../../component-library'; import { AlignItems, @@ -51,6 +52,7 @@ export const AccountPicker = ({ alignItems: AlignItems.center, }} disabled={disabled} + size={showAddress ? ButtonBaseSize.Lg : ButtonBaseSize.Md} > Date: Wed, 11 Oct 2023 10:30:35 -0500 Subject: [PATCH 102/219] UX: Multichain: Display total account balance in account menu (#21202) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** For our multichain effort, we want to show total balances in both the home screen as well as the account menu and any other place we have `AccountListItem` components. This PR creates a `useAccountTotalFiatBalance` hook that returns tokens and the total fiat balance. ## Fixes https://github.com/MetaMask/MetaMask-planning/issues/1426 ## **Manual testing steps** 1. Start the extension with `MULTICHAIN=1 yarn start` 2. Have an account with an ETH balance and token balances 3. On the home screen, ensure the large displayed balance is the sum of ETH and token fiat balances 4. Open the Accounts Menu 5. Ensure that each in the menu displays an fiat value that is the sum of the relevant account With the current build, there should be no changes. ## **Screenshots/Recordings** https://github.com/MetaMask/metamask-extension/assets/46655/87132195-98bc-4ad1-8414-b0999daf3037 ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've clearly explained: - [ ] What problem this PR is solving. - [ ] How this problem was solved. - [ ] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- .../__snapshots__/asset-list.test.js.snap | 339 ------------------ ui/components/app/asset-list/asset-list.js | 91 +---- .../app/asset-list/asset-list.test.js | 3 +- .../detected-token-values.js | 2 +- .../token-list-display/token-list-display.js | 8 +- .../app/wallet-overview/token-overview.js | 2 +- .../account-list-item/account-list-item.js | 10 +- .../balance-overview.test.js.snap | 59 ++- .../balance-overview/balance-overview.js | 12 +- .../balance-overview.stories.js | 2 +- .../balance-overview/balance-overview.test.js | 27 +- .../ui/token-balance/token-balance.js | 2 +- ui/hooks/useAccountTotalFiatBalance.js | 99 +++++ ui/hooks/useAccountTotalFiatBalance.test.js | 124 +++++++ ui/hooks/useAssetDetails.js | 6 +- ui/hooks/useTokenTracker.js | 14 +- ui/pages/swaps/build-quote/build-quote.js | 2 +- .../prepare-swap-page/prepare-swap-page.js | 2 +- .../swaps/prepare-swap-page/review-quote.js | 5 +- ui/pages/swaps/view-quote/view-quote.js | 5 +- ui/pages/token-details/token-details-page.js | 2 +- ui/selectors/selectors.js | 4 + 22 files changed, 367 insertions(+), 453 deletions(-) delete mode 100644 ui/components/app/asset-list/__snapshots__/asset-list.test.js.snap create mode 100644 ui/hooks/useAccountTotalFiatBalance.js create mode 100644 ui/hooks/useAccountTotalFiatBalance.test.js diff --git a/ui/components/app/asset-list/__snapshots__/asset-list.test.js.snap b/ui/components/app/asset-list/__snapshots__/asset-list.test.js.snap deleted file mode 100644 index 7a741c600582..000000000000 --- a/ui/components/app/asset-list/__snapshots__/asset-list.test.js.snap +++ /dev/null @@ -1,339 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`AssetList token fiat value calculations calculates the correct fiat account total 1`] = ` - -`; diff --git a/ui/components/app/asset-list/asset-list.js b/ui/components/app/asset-list/asset-list.js index 259579e380cc..7ce813f4ce6b 100644 --- a/ui/components/app/asset-list/asset-list.js +++ b/ui/components/app/asset-list/asset-list.js @@ -1,7 +1,6 @@ import React, { useContext, useState } from 'react'; import PropTypes from 'prop-types'; -import { shallowEqual, useSelector } from 'react-redux'; -import { isEqual } from 'lodash'; +import { useSelector } from 'react-redux'; import TokenList from '../token-list'; import { PRIMARY, SECONDARY } from '../../../helpers/constants/common'; import { useUserPreferencedCurrency } from '../../../hooks/useUserPreferencedCurrency'; @@ -12,18 +11,12 @@ import { getDetectedTokensInCurrentNetwork, getIstokenDetectionInactiveOnNonMainnetSupportedNetwork, getShouldHideZeroBalanceTokens, - getTokenExchangeRates, - getCurrentCurrency, getIsBuyableChain, getCurrentChainId, getSwapsDefaultToken, getSelectedAddress, } from '../../../selectors'; -import { - getConversionRate, - getNativeCurrency, - getTokens, -} from '../../../ducks/metamask/metamask'; +import { getNativeCurrency } from '../../../ducks/metamask/metamask'; import { useCurrencyDisplay } from '../../../hooks/useCurrencyDisplay'; import Box from '../../ui/box/box'; import { MetaMetricsContext } from '../../../contexts/metametrics'; @@ -40,19 +33,11 @@ import { AssetListConversionButton, } from '../../multichain'; -import { isEqualCaseInsensitive } from '../../../../shared/modules/string-utils'; -import { getTokenFiatAmount } from '../../../helpers/utils/token-util'; -import { formatCurrency } from '../../../helpers/utils/confirm-tx.util'; -import { - getValueFromWeiHex, - sumDecimals, -} from '../../../../shared/modules/conversion.utils'; -import { useTokenTracker } from '../../../hooks/useTokenTracker'; - import useRamps from '../../../hooks/experiences/useRamps'; import { Display } from '../../../helpers/constants/design-system'; import { ReceiveModal } from '../../multichain/receive-modal'; +import { useAccountTotalFiatBalance } from '../../../hooks/useAccountTotalFiatBalance'; const AssetList = ({ onClickAsset }) => { const [showDetectedTokens, setShowDetectedTokens] = useState(false); @@ -63,6 +48,9 @@ const AssetList = ({ onClickAsset }) => { const balance = useSelector(getSelectedAccountCachedBalance); const balanceIsLoading = !balance; const selectedAddress = useSelector(getSelectedAddress); + const shouldHideZeroBalanceTokens = useSelector( + getShouldHideZeroBalanceTokens, + ); const [showReceiveModal, setShowReceiveModal] = useState(false); @@ -95,66 +83,8 @@ const AssetList = ({ onClickAsset }) => { getIstokenDetectionInactiveOnNonMainnetSupportedNetwork, ); - const contractExchangeRates = useSelector( - getTokenExchangeRates, - shallowEqual, - ); - const conversionRate = useSelector(getConversionRate); - const currentCurrency = useSelector(getCurrentCurrency); - - const nativeFiat = getValueFromWeiHex({ - value: balance, - toCurrency: currentCurrency, - conversionRate, - numberOfDecimals: 2, - }); - - const shouldHideZeroBalanceTokens = useSelector( - getShouldHideZeroBalanceTokens, - ); - // use `isEqual` comparison function because the token array is serialized - // from the background so it has a new reference with each background update, - // even if the tokens haven't changed - const tokens = useSelector(getTokens, isEqual); - const { loading, tokensWithBalances } = useTokenTracker( - tokens, - true, - shouldHideZeroBalanceTokens, - ); - - // An array of string balances (ex: ["1.90", "22290.01", ...]) - const dollarBalances = tokensWithBalances.map((token) => { - const contractExchangeTokenKey = Object.keys(contractExchangeRates).find( - (key) => isEqualCaseInsensitive(key, token.address), - ); - const tokenExchangeRate = - (contractExchangeTokenKey && - contractExchangeRates[contractExchangeTokenKey]) ?? - 0; - - const fiat = getTokenFiatAmount( - tokenExchangeRate, - conversionRate, - currentCurrency, - token.string, - token.symbol, - false, - false, - ); - - return fiat; - }); - - // Total native and token fiat balance as a string (ex: "8.90") - const totalFiatBalance = sumDecimals(nativeFiat, ...dollarBalances).toString( - 10, - ); - - // Fiat balance formatted in user's desired currency (ex: "$8.90") - const formattedTotalFiatBalance = formatCurrency( - totalFiatBalance, - currentCurrency, - ); + const { tokensWithBalances, totalFiatBalance, totalWeiBalance, loading } = + useAccountTotalFiatBalance(selectedAddress, shouldHideZeroBalanceTokens); const balanceIsZero = Number(totalFiatBalance) === 0; const isBuyableChain = useSelector(getIsBuyableChain); @@ -167,10 +97,7 @@ const AssetList = ({ onClickAsset }) => { return ( <> {process.env.MULTICHAIN ? ( - + ) : null} {detectedTokens.length > 0 && !isTokenDetectionInactiveOnNonMainnetSupportedNetwork && ( diff --git a/ui/components/app/asset-list/asset-list.test.js b/ui/components/app/asset-list/asset-list.test.js index 9ba19e0cf8f1..9bea60390425 100644 --- a/ui/components/app/asset-list/asset-list.test.js +++ b/ui/components/app/asset-list/asset-list.test.js @@ -89,8 +89,7 @@ describe('AssetList', () => { describe('token fiat value calculations', () => { it('calculates the correct fiat account total', () => { process.env.MULTICHAIN = 1; - const { container } = render(); - expect(container).toMatchSnapshot(); + render(); expect(screen.getByText('$63,356.88 USD')).toBeInTheDocument(); jest.resetModules(); }); diff --git a/ui/components/app/detected-token/detected-token-values/detected-token-values.js b/ui/components/app/detected-token/detected-token-values/detected-token-values.js index ef35f6315cc3..667c356b0e1f 100644 --- a/ui/components/app/detected-token/detected-token-values/detected-token-values.js +++ b/ui/components/app/detected-token/detected-token-values/detected-token-values.js @@ -21,7 +21,7 @@ const DetectedTokenValues = ({ return tokensListDetected[token.address]?.selected; }); - const { tokensWithBalances } = useTokenTracker([token]); + const { tokensWithBalances } = useTokenTracker({ tokens: [token] }); const balanceString = tokensWithBalances[0]?.string; const formattedFiatBalance = useTokenFiatAmount( token.address, diff --git a/ui/components/app/token-list-display/token-list-display.js b/ui/components/app/token-list-display/token-list-display.js index 0c06d0ca2556..e1f4f3c6a8c7 100644 --- a/ui/components/app/token-list-display/token-list-display.js +++ b/ui/components/app/token-list-display/token-list-display.js @@ -17,11 +17,11 @@ export default function TokenListDisplay({ clickHandler }) { ); const tokens = useSelector(getTokens, isEqual); - const { loading, tokensWithBalances } = useTokenTracker( + const { loading, tokensWithBalances } = useTokenTracker({ tokens, - true, - shouldHideZeroBalanceTokens, - ); + includeFailedTokens: true, + hideZeroBalanceTokens: shouldHideZeroBalanceTokens, + }); if (loading) { return
{t('loadingTokens')}
; } diff --git a/ui/components/app/wallet-overview/token-overview.js b/ui/components/app/wallet-overview/token-overview.js index 857218d96b23..d16cbabb6622 100644 --- a/ui/components/app/wallet-overview/token-overview.js +++ b/ui/components/app/wallet-overview/token-overview.js @@ -58,7 +58,7 @@ const TokenOverview = ({ className, token }) => { const t = useContext(I18nContext); const trackEvent = useContext(MetaMetricsContext); const history = useHistory(); - const { tokensWithBalances } = useTokenTracker([token]); + const { tokensWithBalances } = useTokenTracker({ tokens: [token] }); ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-flask) const keyring = useSelector(getCurrentKeyring); const usingHardwareWallet = isHardwareKeyring(keyring.type); diff --git a/ui/components/multichain/account-list-item/account-list-item.js b/ui/components/multichain/account-list-item/account-list-item.js index e154dcd0d224..04210d5490f5 100644 --- a/ui/components/multichain/account-list-item/account-list-item.js +++ b/ui/components/multichain/account-list-item/account-list-item.js @@ -45,6 +45,7 @@ import { } from '../../../../shared/constants/metametrics'; import { MetaMetricsContext } from '../../../contexts/metametrics'; import { getUseBlockie } from '../../../selectors'; +import { useAccountTotalFiatBalance } from '../../../hooks/useAccountTotalFiatBalance'; const MAXIMUM_CURRENCY_DECIMALS = 3; const MAXIMUM_CHARACTERS_WITHOUT_TOOLTIP = 17; @@ -89,6 +90,11 @@ export const AccountListItem = ({ setAccountListItemMenuElement(ref); }; + const { totalWeiBalance } = useAccountTotalFiatBalance(identity.address); + const balanceToTranslate = process.env.MULTICHAIN + ? totalWeiBalance + : identity.balance; + // If this is the selected item in the Account menu, // scroll the item into view const itemRef = useRef(null); @@ -194,7 +200,7 @@ export const AccountListItem = ({ > @@ -225,7 +231,7 @@ export const AccountListItem = ({ > diff --git a/ui/components/multichain/balance-overview/__snapshots__/balance-overview.test.js.snap b/ui/components/multichain/balance-overview/__snapshots__/balance-overview.test.js.snap index 2c885264a0bf..0cf4312db5fe 100644 --- a/ui/components/multichain/balance-overview/__snapshots__/balance-overview.test.js.snap +++ b/ui/components/multichain/balance-overview/__snapshots__/balance-overview.test.js.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Balance Overview and Portfolio for Tokens should match snapshot 1`] = ` +exports[`Balance Overview and Portfolio for Tokens should output correct ETH total value 1`] = `
- $1,209.02 +
+ + 0.001 + + + ETH + +
+ +
+ +
+
+`; + +exports[`Balance Overview and Portfolio for Tokens should output correct USD total value 1`] = ` +
+
+
+

+
+ + $2.05 + + + USD + +

+
+ + +

+ Connections +

+ +
+
+
+`; diff --git a/ui/components/multichain/app-footer/app-footer.js b/ui/components/multichain/app-footer/app-footer.js index fe536945d5de..eac46c72666c 100644 --- a/ui/components/multichain/app-footer/app-footer.js +++ b/ui/components/multichain/app-footer/app-footer.js @@ -1,10 +1,7 @@ import React from 'react'; -import { useLocation } from 'react-router-dom'; +import { useHistory, useLocation } from 'react-router-dom'; import { useDispatch, useSelector } from 'react-redux'; -import { - CONNECTED_ROUTE, - DEFAULT_ROUTE, -} from '../../../helpers/constants/routes'; +import { CONNECTIONS, DEFAULT_ROUTE } from '../../../helpers/constants/routes'; import { AvatarFavicon, AvatarNetwork, @@ -46,11 +43,11 @@ export const AppFooter = () => { const t = useI18nContext(); const location = useLocation(); const dispatch = useDispatch(); + const history = useHistory(); - const walletRoute = `#${DEFAULT_ROUTE}`; - const connectedRoute = `#${CONNECTED_ROUTE}`; const activeWallet = location.pathname === DEFAULT_ROUTE; - const activeConnections = location.pathname === CONNECTED_ROUTE; + const activeConnections = location.pathname === CONNECTIONS; + const isUnlocked = useSelector((state) => state.metamask.isUnlocked); const selectedAddress = useSelector(getSelectedAddress); @@ -67,124 +64,152 @@ export const AppFooter = () => { const currentChain = useSelector(getCurrentNetwork); return ( - - - - - {t('wallet')} - - - - dispatch(showSelectActionModal())} - /> - - - {connectedSite ? ( - - + {isUnlocked ? ( + <> + + - } + alignItems={AlignItems.center} + justifyContent={JustifyContent.spaceBetween} + backgroundColor={BackgroundColor.backgroundDefault} + flexDirection={FlexDirection.Row} + padding={2} + paddingLeft={4} + paddingRight={4} + gap={2} > - - + { + e.preventDefault(); + history.push(DEFAULT_ROUTE); + }} + className="app-footer__button" + width={BlockSize.OneThird} + padding={2} + display={Display.Flex} + flexDirection={FlexDirection.Column} + alignItems={AlignItems.center} + tabIndex={0} + > + + + {t('wallet')} + + + + dispatch(showSelectActionModal())} + /> + + { + e.preventDefault(); + history.push(CONNECTIONS); + }} + className="app-footer__button" + width={BlockSize.OneThird} + padding={2} + display={Display.Flex} + flexDirection={FlexDirection.Column} + alignItems={AlignItems.center} + tabIndex={0} + > + {connectedSite ? ( + + + } + > + + + + ) : ( + + )} + + {t('connections')} + + + - ) : ( - - )} - - {t('connections')} - - - + + ) : null} + ); }; diff --git a/ui/components/multichain/app-footer/app-footer.scss b/ui/components/multichain/app-footer/app-footer.scss index c36d1a046659..dac248d579e4 100644 --- a/ui/components/multichain/app-footer/app-footer.scss +++ b/ui/components/multichain/app-footer/app-footer.scss @@ -1,8 +1,41 @@ .app-footer { + $height-screen-sm-max: 100%; + $width-screen-sm-min: 85vw; + $width-screen-md-min: 80vw; + $width-screen-lg-min: 62vw; + bottom: 0; position: sticky; + z-index: 55; // we are applying same z-index for header as well + min-height: 64px; + flex-flow: column nowrap; + + &__contents { + height: 64px; + box-shadow: var(--shadow-size-md) var(--color-shadow-default); + + @include screen-sm-max { + height: $height-screen-sm-max; + } + + @include screen-sm-min { + width: $width-screen-sm-min; + margin-bottom: 10vh; // same as main container + } + + @include screen-md-min { + width: $width-screen-md-min; + } + + @include screen-lg-min { + width: $width-screen-lg-min; + } + } - &__button { - cursor: pointer; + &__actions-button { + &:hover, + &:focus { + background-color: var(--color-primary-default); + } } } diff --git a/ui/components/multichain/app-footer/app-footer.test.js b/ui/components/multichain/app-footer/app-footer.test.js new file mode 100644 index 000000000000..d6b3e82a5146 --- /dev/null +++ b/ui/components/multichain/app-footer/app-footer.test.js @@ -0,0 +1,25 @@ +import React from 'react'; +import configureStore from '../../../store/store'; +import { renderWithProvider } from '../../../../test/lib/render-helpers'; +import mockState from '../../../../test/data/mock-state.json'; +import { AppFooter } from '.'; + +const store = configureStore({ + ...mockState, + activeTab: { + origin: 'https://remix.ethereum.org', + }, +}); + +describe('App Footer', () => { + it('should match snapshot', () => { + const { container } = renderWithProvider(, store); + expect(container).toMatchSnapshot(); + }); + + it('should render correctly', () => { + const { queryByTestId } = renderWithProvider(, store); + + expect(queryByTestId('app-footer')).toBeDefined(); + }); +}); diff --git a/ui/css/itcss/components/newui-sections.scss b/ui/css/itcss/components/newui-sections.scss index f0462fd5d091..1226492d64fd 100644 --- a/ui/css/itcss/components/newui-sections.scss +++ b/ui/css/itcss/components/newui-sections.scss @@ -58,7 +58,6 @@ .main-container { width: 85vw; - margin-bottom: 10vh; min-height: 90vh; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); } diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js index deb2f0986835..1a5c525d5661 100644 --- a/ui/pages/routes/routes.component.js +++ b/ui/pages/routes/routes.component.js @@ -35,6 +35,7 @@ import { ImportNftsModal, ImportTokensModal, SelectActionModal, + AppFooter, } from '../../components/multichain'; import UnlockPage from '../unlock-page'; import Alerts from '../../components/app/alerts'; @@ -478,6 +479,25 @@ export default class Routes extends Component { return isHandlingPermissionsRequest || isHandlingAddEthereumChainRequest; } + showFooter() { + if (Boolean(process.env.MULTICHAIN) === false) { + return false; + } + + const { location } = this.props; + const isHomePage = Boolean( + matchPath(location.pathname, { path: DEFAULT_ROUTE, exact: true }), + ); + const isConnectionsPage = Boolean( + matchPath(location.pathname, { path: CONNECTIONS, exact: true }), + ); + const isAssetPage = Boolean( + matchPath(location.pathname, { path: ASSET_ROUTE, exact: false }), + ); + + return isAssetPage || isHomePage || isConnectionsPage; + } + showOnboardingHeader() { const { location } = this.props; @@ -619,6 +639,7 @@ export default class Routes extends Component { {!isLoading && isNetworkLoading ? : null} {this.renderRoutes()} + {this.showFooter() && } {isUnlocked ? : null}
); From b90509897893f58431d28cc40deee3abe403ba1e Mon Sep 17 00:00:00 2001 From: Marina Boboc <120041701+benjisclowder@users.noreply.github.com> Date: Wed, 11 Oct 2023 19:52:08 +0300 Subject: [PATCH 105/219] Test scenarios documentation update (#21295) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** _Write a short description of the changes included in this pull request, also include relevant motivation and context. Have in mind the following questions:_ _1. What is the reason for the change?_ _2. What is the improvement/solution?_ 1. Deleting line 19 from the ens/name resolution.csv file - "The recipient's hexadecimal address is shown in the activity list item." as the hexadecimal address is not supposed to be shown in the activity list item unless you open the activity list item. 2. Changing lines 16 and 17 in the metrics/send event metrics.csv file to better reflect on the manual steps required. 3. Changing mentions of Goerli to Sepolia due to Goerli's deprecation. 4. Fixing typos. ## **Manual testing steps** _1. Step1:_ _2. Step2:_ _3. ..._ ## **Screenshots/Recordings** _If applicable, add screenshots and/or recordings to visualize the before and after of your change._ ### **Before** _[screenshot]_ ### **After** _[screenshot]_ ## **Related issues** _Fixes #???_ ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've clearly explained: - [ ] What problem this PR is solving. - [ ] How this problem was solved. - [ ] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- test/scenarios/3. transactions/cancel transaction.csv | 4 ++-- .../3. transactions/send erc20 token origin MM.csv | 8 ++++---- .../3. transactions/send erc721 token origin MM.csv | 8 ++++---- .../3. transactions/send native token origin MM.csv | 4 ++-- .../scenarios/3. transactions/speed up transaction.csv | 4 ++-- .../4. tokens/import erc1155 token origin MM.csv | 10 +++++----- .../4. tokens/import erc20 token origin MM.csv | 6 +++--- .../4. tokens/import erc721 token origin MM.csv | 8 ++++---- test/scenarios/5. ens/name resolution.csv | 7 +++---- test/scenarios/9. metrics/send event metrics.csv | 7 ++++--- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/test/scenarios/3. transactions/cancel transaction.csv b/test/scenarios/3. transactions/cancel transaction.csv index 031edc14b130..cf7346919a54 100644 --- a/test/scenarios/3. transactions/cancel transaction.csv +++ b/test/scenarios/3. transactions/cancel transaction.csv @@ -3,9 +3,9 @@ Step,Test Steps,Test Data,Expected Result,Notes 2,Proceed to Unlock the wallet.,password (8 characters min).,"The Ether balance is shown on the overview. The wallet address is shown on the overview. The selected network is Ethereum Mainnet.", -3,Switch networks to a test network.,e.g. Goerli.,"The Goerli balance is shown on the overview. +3,Switch networks to a test network.,e.g. Sepolia.,"The Sepolia balance is shown on the overview. The wallet address is shown on the overview. -The selected network is Goerli.", +The selected network is Sepolia.", 4,Proceed to the Send flow.,,, 5,Enter a public address.,e.g. 0x56F2e03c8D30649818c022a9759CF43B240D08B3.,, 6,Enter an amount.,e.g. 0.1.,, diff --git a/test/scenarios/3. transactions/send erc20 token origin MM.csv b/test/scenarios/3. transactions/send erc20 token origin MM.csv index 05b0f9fb637a..5aa6d6b02a02 100644 --- a/test/scenarios/3. transactions/send erc20 token origin MM.csv +++ b/test/scenarios/3. transactions/send erc20 token origin MM.csv @@ -3,16 +3,16 @@ Step,Test Steps,Test Data,Expected Result,Notes 2,Proceed to Unlock the wallet.,password (8 characters min).,"The Ether balance is shown on the overview. The wallet address is shown on the overview. The selected network is Ethereum Mainnet.", -3,Switch networks to a test network.,e.g. Goerli.,"The Goerli balance is shown on the overview. +3,Switch networks to a test network.,e.g. Sepolia.,"The Sepolia balance is shown on the overview. The wallet address is shown on the overview. -The selected network is Goerli.", +The selected network is Sepolia.", 4,Open the test dapp in another tab.,https://metamask.github.io/test-dapp/,, 5,Proceed to Connect with MetaMask.,,, 6,Connect with the current account.,,, 7,Deploy the Token contract.,,, -8,Confirm the transaction and wait for the it to complete.,,, +8,Confirm the transaction and wait for it to complete.,,, 9,Proceed to add the token to the wallet.,,, -10,Confirm the suggested token notification.,,"The TST token is shown in the wallets token list. +10,Confirm the suggested token notification.,,"The TST token is shown in the wallet's token list. The TST token symbol is shown. The TST token icon is shown. The TST token balance is shown.", diff --git a/test/scenarios/3. transactions/send erc721 token origin MM.csv b/test/scenarios/3. transactions/send erc721 token origin MM.csv index 8a988375cbaa..faeca234a1a2 100644 --- a/test/scenarios/3. transactions/send erc721 token origin MM.csv +++ b/test/scenarios/3. transactions/send erc721 token origin MM.csv @@ -3,16 +3,16 @@ Step,Test Steps,Test Data,Expected Result,Notes 2,Proceed to Unlock the wallet.,password (8 characters min).,"The Ether balance is shown on the overview. The wallet address is shown on the overview. The selected network is Ethereum Mainnet.", -3,Switch networks to a test network.,e.g. Goerli.,"The Goerli balance is shown on the overview. +3,Switch networks to a test network.,e.g. Sepolia.,"The Sepolia balance is shown on the overview. The wallet address is shown on the overview. -The selected network is Goerli.", +The selected network is Sepolia.", 4,Open the test dapp in another tab.,https://metamask.github.io/test-dapp/,, 5,Proceed to Connect with MetaMask.,,, 6,Connect with the current account.,,, 7,Proceed to Deploy the NFT contract.,,, -8,Confirm the transaction and wait for the it to complete.,,, +8,Confirm the transaction and wait for it to complete.,,, 9,Proceed to Mint an NFT.,,, -10,Confirm the transaction and wait for the it to complete.,,, +10,Confirm the transaction and wait for it to complete.,,, 11,Proceed to Watch NFT.,,, 12,Confirm the suggested NFT notification.,,"The NFT is shown in the wallets NFTs list. The NFT image is shown.", diff --git a/test/scenarios/3. transactions/send native token origin MM.csv b/test/scenarios/3. transactions/send native token origin MM.csv index 8bf34a45033a..9e9172ff866c 100644 --- a/test/scenarios/3. transactions/send native token origin MM.csv +++ b/test/scenarios/3. transactions/send native token origin MM.csv @@ -3,9 +3,9 @@ Step,Test Steps,Test Data,Expected Result,Notes 2,Proceed to Unlock the wallet.,password (8 characters min).,"The Ether balance is shown on the overview. The wallet address is shown on the overview. The selected network is Ethereum Mainnet.", -3,Switch networks to a test network.,e.g. Goerli.,"The Goerli balance is shown on the overview. +3,Switch networks to a test network.,e.g. Sepolia.,"The Sepolia balance is shown on the overview. The wallet address is shown on the overview. -The selected network is Goerli.", +The selected network is Sepolia.", 4,Proceed to the Send flow.,,, 5,Enter a public address.,e.g. 0x56F2e03c8D30649818c022a9759CF43B240D08B3.,, 6,Enter an amount.,e.g. 0.1.,, diff --git a/test/scenarios/3. transactions/speed up transaction.csv b/test/scenarios/3. transactions/speed up transaction.csv index 14c87989aed3..259e3a156dc9 100644 --- a/test/scenarios/3. transactions/speed up transaction.csv +++ b/test/scenarios/3. transactions/speed up transaction.csv @@ -3,9 +3,9 @@ Step,Test Steps,Test Data,Expected Result,Notes 2,Proceed to Unlock the wallet.,password (8 characters min).,"The Ether balance is shown on the overview. The wallet address is shown on the overview. The selected network is Ethereum Mainnet.", -3,Switch networks to a test network.,e.g. Goerli.,"The Goerli balance is shown on the overview. +3,Switch networks to a test network.,e.g. Sepolia.,"The Sepolia balance is shown on the overview. The wallet address is shown on the overview. -The selected network is Goerli.", +The selected network is Sepolia.", 4,Proceed to the Send flow.,,, 5,Enter a public address.,e.g. 0x56F2e03c8D30649818c022a9759CF43B240D08B3.,, 6,Enter an amount.,e.g. 0.1.,, diff --git a/test/scenarios/4. tokens/import erc1155 token origin MM.csv b/test/scenarios/4. tokens/import erc1155 token origin MM.csv index 1c4218d7cf42..1c2a7e7c72db 100644 --- a/test/scenarios/4. tokens/import erc1155 token origin MM.csv +++ b/test/scenarios/4. tokens/import erc1155 token origin MM.csv @@ -3,16 +3,16 @@ Step,Test Steps,Test Data,Expected Result,Notes 2,Proceed to Unlock the wallet.,password (8 characters min).,"The Ether balance is shown on the overview. The wallet address is shown on the overview. The selected network is Ethereum Mainnet.", -3,Switch networks to a test network.,e.g. Goerli.,"The Goerli balance is shown on the overview. +3,Switch networks to a test network.,e.g. Sepolia.,"The Sepolia balance is shown on the overview. The wallet address is shown on the overview. -The selected network is Goerli.", +The selected network is Sepolia.", 4,Open the test dapp in another tab.,https://metamask.github.io/test-dapp/,, 5,Proceed to Connect with MetaMask.,,, 6,Connect with the current account.,,, 7,Deploy the ERC1155 contract.,,, -8,Confirm the transaction and wait for the it to complete.,,, +8,Confirm the transaction and wait for it to complete.,,, 9,Proceed to Batch Mint NFTs.,,, -10,Confirm the transaction and wait for the it to complete.,,, +10,Confirm the transaction and wait for it to complete.,,, 11,Close the test dapp and switch back to the wallet.,,, 12,Open the activity list item.,,"The transaction status, recipient's address, nonce, amount, gas and total are shown in the item details.", 13,Proceed to view the transaction on the block explorer.,,The block explorer opens in a new tab., Take a note of the Contract address. @@ -21,7 +21,7 @@ The selected network is Goerli.", 16,Proceed to the Import tokens flow.,,, 17,Enter the contract address.,Contract address.,, 18,Enter the token id.,e.g. 1.,, -19,Confirm the addition of the custom token.,,"The NFT is shown in the wallets NFTs list. +19,Confirm the addition of the custom token.,,"The NFT is shown in the wallet's NFTs list. The NFT image is shown.", 20,Proceed to open the NFT.,,"The NFT details page is shown. The NFT collection name is shown. diff --git a/test/scenarios/4. tokens/import erc20 token origin MM.csv b/test/scenarios/4. tokens/import erc20 token origin MM.csv index 4a7c2c2aca62..2c699689836c 100644 --- a/test/scenarios/4. tokens/import erc20 token origin MM.csv +++ b/test/scenarios/4. tokens/import erc20 token origin MM.csv @@ -3,14 +3,14 @@ Step,Test Steps,Test Data,Expected Result,Notes 2,Proceed to Unlock the wallet.,password (8 characters min).,"The Ether balance is shown on the overview. The wallet address is shown on the overview. The selected network is Ethereum Mainnet.", -3,Switch networks to a test network.,e.g. Goerli.,"The Goerli balance is shown on the overview. +3,Switch networks to a test network.,e.g. Sepolia.,"The Sepolia balance is shown on the overview. The wallet address is shown on the overview. -The selected network is Goerli.", +The selected network is Sepolia.", 4,Open the test dapp in another tab.,https://metamask.github.io/test-dapp/,, 5,Proceed to Connect with MetaMask.,,, 6,Connect with the current account.,,, 7,Deploy the Token contract.,,, -8,Confirm the transaction and wait for the it to complete.,,, +8,Confirm the transaction and wait for it to complete.,,, 9,Close the test dapp and switch back to the wallet.,,, 10,Open the activity list item.,,"The transaction status, recipient's address, nonce, amount, gas and total are shown in the item details.", 11,Proceed to view the transaction on the block explorer.,,The block explorer opens in a new tab., Take a note of the Contract address. diff --git a/test/scenarios/4. tokens/import erc721 token origin MM.csv b/test/scenarios/4. tokens/import erc721 token origin MM.csv index f4bab1bae136..503e46dd6bb1 100644 --- a/test/scenarios/4. tokens/import erc721 token origin MM.csv +++ b/test/scenarios/4. tokens/import erc721 token origin MM.csv @@ -3,16 +3,16 @@ Step,Test Steps,Test Data,Expected Result,Notes 2,Proceed to Unlock the wallet.,password (8 characters min).,"The Ether balance is shown on the overview. The wallet address is shown on the overview. The selected network is Ethereum Mainnet.", -3,Switch networks to a test network.,e.g. Goerli.,"The Goerli balance is shown on the overview. +3,Switch networks to a test network.,e.g. Sepolia.,"The Sepolia balance is shown on the overview. The wallet address is shown on the overview. -The selected network is Goerli.", +The selected network is Sepolia.", 4,Open the test dapp in another tab.,https://metamask.github.io/test-dapp/,, 5,Proceed to Connect with MetaMask.,,, 6,Connect with the current account.,,, 7,Deploy the NFT contract.,,, 8,Confirm the transaction and wait for the it to complete.,,, 9,Proceed to Mint an NFT.,,, -10,Confirm the transaction and wait for the it to complete.,,, +10,Confirm the transaction and wait for it to complete.,,, 11,Close the test dapp and switch back to the wallet.,,, 12,Open the activity list item.,,"The transaction status, recipient's address, nonce, amount, gas and total are shown in the item details.", 13,Proceed to view the transaction on the block explorer.,,The block explorer opens in a new tab., Take a note of the Contract address. @@ -21,7 +21,7 @@ The selected network is Goerli.", 16,Proceed to the Import tokens flow.,,, 17,Enter the contract address.,Contract address.,, 18,Enter the token id.,e.g. 1.,, -19,Confirm the addition of the custom token.,,"The NFT is shown in the wallets NFTs list. +19,Confirm the addition of the custom token.,,"The NFT is shown in the wallet's NFTs list. The NFT image is shown.", 20,Proceed to open the NFT.,,"The NFT details page is shown. The NFT collection name is shown. diff --git a/test/scenarios/5. ens/name resolution.csv b/test/scenarios/5. ens/name resolution.csv index 2f9aa182568a..6490aad66451 100644 --- a/test/scenarios/5. ens/name resolution.csv +++ b/test/scenarios/5. ens/name resolution.csv @@ -3,9 +3,9 @@ Step,Test Steps,Test Data,Expected Result,Notes 2,Proceed to Unlock the wallet.,password (8 characters min).,"The Ether balance is shown on the overview. The wallet address is shown on the overview. The selected network is Ethereum Mainnet.", -3,Switch networks to a test network.,e.g. Goerli.,"The Goerli balance is shown on the overview. +3,Switch networks to a test network.,e.g. Sepolia.,"The Sepolia balance is shown on the overview. The wallet address is shown on the overview. -The selected network is Goerli.", +The selected network is Sepolia.", 4,Proceed to the Send flow.,,, 5,Enter an ENS address.,e.g. peteryinusa.eth.,"A matching result appears in the recipient list. The ENS address is shown in the list item. @@ -15,6 +15,5 @@ The ENS address is shown in the recipient field. The hexadecimal address is shown in the recipient field.", 7,Enter an amount.,e.g. 0.1.,, 8,Proceed to the confirmation screen.,,The recipient's ENS address is shown., -9,Confirm the transaction.,,"The transaction appears in the activity list. -The recipient's hexadecimal address is shown in the activity list item.", +9,Confirm the transaction.,,"The transaction appears in the activity list.", 10,Open the activity list item.,,The recipient's ENS address is shown in the item details., \ No newline at end of file diff --git a/test/scenarios/9. metrics/send event metrics.csv b/test/scenarios/9. metrics/send event metrics.csv index 6a850c6c623e..f320dfb9cfd0 100644 --- a/test/scenarios/9. metrics/send event metrics.csv +++ b/test/scenarios/9. metrics/send event metrics.csv @@ -13,6 +13,7 @@ Chrome: chrome://extensions/",The extensions page is displayed., 8,Enable developer mode/debug addons.,,, 9,Inspect background.html using the browsers developer tools.,,The browsers developer tools window opens., 10,Select the Network tab.,,, -11,Close the browsers extension page and switch back to the wallet.,,, -12,Proceed to General in the Settings menu.,,"A request to Sentry is made - https://api.segment.io/v1/batch. -The request payload is valid JSON and contains the name General Settings Page.", \ No newline at end of file +11,Keep the background console open and head over to the wallet.,,, +12,Proceed to General in the Settings menu.,,"A request to Sentry is made in the networks tab under payload - https://api.segment.io/v1/batch. +The request payload is valid JSON and contains the name General Settings Page.", +,,,, From 641ff77fc4283d6ae0f7e403a36127b4b7d49cb9 Mon Sep 17 00:00:00 2001 From: David Walsh Date: Wed, 11 Oct 2023 15:39:42 -0500 Subject: [PATCH 106/219] Fix breaking jest test for asset-list (#21324) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes the current jest error on `develop` branch: ``` TypeError: Cannot read properties of undefined (reading 'nickname') 43 | showEthLogo, 44 | nativeCurrency, > 45 | currentNetwork.nickname, | ^ 46 | currentNetwork?.rpcPrefs?.imageUrl, 47 | ]); 48 | return ( at nickname (ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js:45:20) at renderWithHooks (node_modules/react-dom/cjs/react-dom.development.js:16260:18) at mountIndeterminateComponent (node_modules/react-dom/cjs/react-dom.development.js:18794:13) at beginWork$1 (node_modules/react-dom/cjs/react-dom.development.js:20162:16) ``` ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've clearly explained: - [ ] What problem this PR is solving. - [ ] How this problem was solved. - [ ] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- .../user-preferenced-currency-display.component.js | 2 +- ui/hooks/useAccountTotalFiatBalance.test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js b/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js index 04746bc42dac..14e2085f9c88 100644 --- a/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js +++ b/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js @@ -42,7 +42,7 @@ export default function UserPreferencedCurrencyDisplay({ currency, showEthLogo, nativeCurrency, - currentNetwork.nickname, + currentNetwork?.nickname, currentNetwork?.rpcPrefs?.imageUrl, ]); return ( diff --git a/ui/hooks/useAccountTotalFiatBalance.test.js b/ui/hooks/useAccountTotalFiatBalance.test.js index 748269c0a13b..f45c2a7ebf45 100644 --- a/ui/hooks/useAccountTotalFiatBalance.test.js +++ b/ui/hooks/useAccountTotalFiatBalance.test.js @@ -96,7 +96,7 @@ describe('useAccountTotalFiatBalance', () => { ); expect(result.current).toStrictEqual({ formattedFiat: '$9.41', - totalWeiBalance: '14ba1e6a08a9ec', + totalWeiBalance: '14ba1e6a08a9ed', totalFiatBalance: '9.41', tokensWithBalances: [ { From 313abb17ed7976ef86bc3b08afde72dc94828061 Mon Sep 17 00:00:00 2001 From: jiexi Date: Wed, 11 Oct 2023 15:29:01 -0700 Subject: [PATCH 107/219] Add EIP-6963 Provider (#19908) ## Explanation Helps to alleviate `window.ethereum` conflicts by supporting an alternative way for Dapps to discover and interact with providers. This PR implements [EIP-6963](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-6963.md) which adds an async event based provider discovery standard. ~~NOTE: I'm not sure if we strictly need the changes I made that add EIP-6963 support to the test dapp, but we probably want to add an e2e test for EIP-6963 and I'm not sure if we want our tests to rely on an external site like https://eip6963.org/ . Maybe we can test this by running some js in page like we do for testing parts of the json rpc in e2e environment.~~ I've added a spec for this that tests it directly in the browser console instead Ticket: [mmp-869](https://github.com/MetaMask/MetaMask-planning/issues/869) Related: https://github.com/MetaMask/providers/pull/263 ~~Related: https://github.com/MetaMask/test-dapp/pull/243~~ # Screenshot Screenshot 2023-09-27 at 4 41 13 PM ## Manual Testing Steps * Install and enable a few other browser extension wallets * Visit https://eip6963.org/ * MetaMask should show up in the list of providers and play nicely with all of them ## Pre-merge author checklist - [x] I've clearly explained: - [x] What problem this PR is solving - [x] How this problem was solved - [x] How reviewers can test my changes - [x] Sufficient automated test coverage has been added ## Pre-merge reviewer checklist - [ ] Manual testing (e.g. pull and build branch, run in browser, test code being changed) - [ ] PR is linked to the appropriate GitHub issue - [ ] **IF** this PR fixes a bug in the release milestone, add this PR to the release milestone If further QA is required (e.g. new feature, complex testing steps, large refactor), add the `Extension QA Board` label. In this case, a QA Engineer approval will be be required. --- app/scripts/inpage.js | 7 +++ builds.yml | 6 ++ development/build/manifest.js | 21 +++---- development/build/scripts.js | 13 +++++ development/build/utils.js | 71 ++++++++++++++++++++++ package.json | 2 +- test/e2e/provider/eip-6963.spec.js | 94 ++++++++++++++++++++++++++++++ yarn.lock | 10 ++-- 8 files changed, 206 insertions(+), 18 deletions(-) create mode 100644 test/e2e/provider/eip-6963.spec.js diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index 92ae8d28658b..d00a0542db03 100644 --- a/app/scripts/inpage.js +++ b/app/scripts/inpage.js @@ -32,6 +32,7 @@ cleanContextForImports(); /* eslint-disable import/first */ import log from 'loglevel'; +import { v4 as uuid } from 'uuid'; import { WindowPostMessageStream } from '@metamask/post-message-stream'; import { initializeProvider } from '@metamask/providers/dist/initializeInpageProvider'; import shouldInjectProvider from '../../shared/modules/provider-injection'; @@ -59,5 +60,11 @@ if (shouldInjectProvider()) { connectionStream: metamaskStream, logger: log, shouldShimWeb3: true, + providerInfo: { + uuid: uuid(), + name: process.env.METAMASK_BUILD_NAME, + icon: process.env.METAMASK_BUILD_ICON, + rdns: process.env.METAMASK_BUILD_APP_ID, + }, }); } diff --git a/builds.yml b/builds.yml index 6259e41c2375..8f2060ed9c82 100644 --- a/builds.yml +++ b/builds.yml @@ -232,6 +232,12 @@ env: # Modified in /development/build/scripts.js:@setEnvironmentVariables - METAMASK_BUILD_TYPE # Modified in /development/build/scripts.js:@setEnvironmentVariables + - METAMASK_BUILD_NAME + # Modified in /development/build/scripts.js:@setEnvironmentVariables + - METAMASK_BUILD_APP_ID + # Modified in /development/build/scripts.js:@setEnvironmentVariables + - METAMASK_BUILD_ICON + # Modified in /development/build/scripts.js:@setEnvironmentVariables - NODE_ENV # Defined by node itself # For the purposes of the build system we define it as empty below diff --git a/development/build/manifest.js b/development/build/manifest.js index d9f0f71ca1ff..a12f1c455558 100644 --- a/development/build/manifest.js +++ b/development/build/manifest.js @@ -1,7 +1,7 @@ const { promises: fs } = require('fs'); const path = require('path'); const childProcess = require('child_process'); -const { mergeWith, cloneDeep, capitalize } = require('lodash'); +const { mergeWith, cloneDeep } = require('lodash'); const baseManifest = process.env.ENABLE_MV3 ? require('../../app/manifest/v3/_base.json') @@ -10,7 +10,7 @@ const { loadBuildTypesConfig } = require('../lib/build-type'); const { TASKS, ENVIRONMENT } = require('./constants'); const { createTask, composeSeries } = require('./task'); -const { getEnvironment } = require('./utils'); +const { getEnvironment, getBuildName } = require('./utils'); module.exports = createManifestTasks; @@ -124,10 +124,6 @@ function createManifestTasks({ return; } - const mv3Str = process.env.ENABLE_MV3 ? ' MV3' : ''; - const lavamoatStr = applyLavaMoat ? ' lavamoat' : ''; - const snowStr = shouldIncludeSnow ? ' snow' : ''; - // Get the first 8 characters of the git revision id const gitRevisionStr = childProcess .execSync('git rev-parse HEAD') @@ -135,12 +131,13 @@ function createManifestTasks({ .trim() .substring(0, 8); - const buildName = - buildType === 'mmi' - ? `MetaMask Institutional ${mv3Str}` - : `MetaMask ${capitalize(buildType)}${mv3Str}${lavamoatStr}${snowStr}`; - - manifest.name = buildName; + manifest.name = getBuildName({ + environment, + buildType, + applyLavaMoat, + shouldIncludeSnow, + shouldIncludeMV3: process.env.ENABLE_MV3, + }); manifest.description = `${environment} build from git id: ${gitRevisionStr}`; } diff --git a/development/build/scripts.js b/development/build/scripts.js index fa50a925c09f..f33d509991e0 100644 --- a/development/build/scripts.js +++ b/development/build/scripts.js @@ -40,6 +40,9 @@ const { getEnvironment, logError, wrapAgainstScuttling, + getBuildName, + getBuildAppId, + getBuildIcon, } = require('./utils'); const { @@ -1181,6 +1184,16 @@ async function setEnvironmentVariables({ testing, }), METAMASK_DEBUG: devMode || variables.getMaybe('METAMASK_DEBUG') === true, + METAMASK_BUILD_NAME: getBuildName({ + environment, + buildType, + }), + METAMASK_BUILD_APP_ID: getBuildAppId({ + buildType, + }), + METAMASK_BUILD_ICON: getBuildIcon({ + buildType, + }), METAMASK_ENVIRONMENT: environment, METAMASK_VERSION: version, METAMASK_BUILD_TYPE: buildType, diff --git a/development/build/utils.js b/development/build/utils.js index 9b5bd58e3738..2f814b753014 100644 --- a/development/build/utils.js +++ b/development/build/utils.js @@ -1,8 +1,18 @@ const path = require('path'); +const { readFileSync } = require('fs'); const semver = require('semver'); +const { capitalize } = require('lodash'); const { loadBuildTypesConfig } = require('../lib/build-type'); const { BUILD_TARGETS, ENVIRONMENT } = require('./constants'); +const BUILD_TYPES_TO_SVG_LOGO_PATH = { + main: './app/images/logo/metamask-fox.svg', + beta: './app/build-types/beta/images/logo/metamask-fox.svg', + flask: './app/build-types/flask/images/logo/metamask-fox.svg', + mmi: './app/build-types/mmi/images/logo/mmi-logo.svg', + desktop: './app/build-types/desktop/images/logo/metamask-fox.svg', +}; + /** * Returns whether the current build is a development build or not. * @@ -218,8 +228,69 @@ function getPathInsideNodeModules(packageName, pathToFiles) { return targetPath; } +/** + * Get the name for the current build. + * + * @param {object} options - The build options. + * @param {string} options.buildType - The build type of the current build. + * @param {boolean} options.applyLavaMoat - Flag if lavamoat was applied. + * @param {boolean} options.shouldIncludeSnow - Flag if snow should be included in the build name. + * @param {boolean} options.shouldIncludeMV3 - Flag if mv3 should be included in the build name. + * @param options.environment + * @returns {string} The build name. + */ +function getBuildName({ + environment, + buildType, + applyLavaMoat, + shouldIncludeSnow, + shouldIncludeMV3, +}) { + if (environment === ENVIRONMENT.PRODUCTION) { + return 'MetaMask'; + } + + const mv3Str = shouldIncludeMV3 ? ' MV3' : ''; + const lavamoatStr = applyLavaMoat ? ' lavamoat' : ''; + const snowStr = shouldIncludeSnow ? ' snow' : ''; + + return buildType === 'mmi' + ? `MetaMask Institutional${mv3Str}` + : `MetaMask ${capitalize(buildType)}${mv3Str}${lavamoatStr}${snowStr}`; +} + +/** + * Get the app ID for the current build. Should be valid reverse FQDN. + * + * @param {object} options - The build options. + * @param {string} options.buildType - The build type of the current build. + * @returns {string} The build app ID. + */ +function getBuildAppId({ buildType }) { + const baseDomain = 'io.metamask'; + return buildType === 'main' ? baseDomain : `${baseDomain}.${buildType}`; +} + +/** + * Get the image data uri for the svg icon for the current build. + * + * @param {object} options - The build options. + * @param {string} options.buildType - The build type of the current build. + * @returns {string} The image data uri for the icon. + */ +function getBuildIcon({ buildType }) { + const svgLogoPath = + BUILD_TYPES_TO_SVG_LOGO_PATH[buildType] || + BUILD_TYPES_TO_SVG_LOGO_PATH.main; + const svg = readFileSync(svgLogoPath, 'utf8'); + return `data:image/svg+xml,${encodeURIComponent(svg)}`; +} + module.exports = { getBrowserVersionMap, + getBuildName, + getBuildAppId, + getBuildIcon, getEnvironment, isDevBuild, isTestBuild, diff --git a/package.json b/package.json index 3e8d455a83f5..8004357acee1 100644 --- a/package.json +++ b/package.json @@ -269,7 +269,7 @@ "@metamask/phishing-controller": "^6.0.0", "@metamask/post-message-stream": "^6.2.0", "@metamask/ppom-validator": "^0.5.0", - "@metamask/providers": "^13.0.0", + "@metamask/providers": "^13.1.0", "@metamask/rate-limit-controller": "^3.0.0", "@metamask/rpc-methods": "^3.0.0", "@metamask/safe-event-emitter": "^2.0.0", diff --git a/test/e2e/provider/eip-6963.spec.js b/test/e2e/provider/eip-6963.spec.js new file mode 100644 index 000000000000..751a4e674633 --- /dev/null +++ b/test/e2e/provider/eip-6963.spec.js @@ -0,0 +1,94 @@ +const { strict: assert } = require('assert'); +const FixtureBuilder = require('../fixture-builder'); +const { convertToHexValue, withFixtures, openDapp } = require('../helpers'); + +// https://github.com/thenativeweb/uuidv4/blob/bdcf3a3138bef4fb7c51f389a170666f9012c478/lib/uuidv4.ts#L5 +const UUID_V4_REGEX = + /(?:^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[a-f0-9]{4}-[a-f0-9]{12}$)|(?:^0{8}-0{4}-0{4}-0{4}-0{12}$)/u; + +const SVG_DATA_URI_REGEX = /^data:image\/svg\+xml,/u; + +describe('EIP-6963 Provider', function () { + const ganacheOptions = { + accounts: [ + { + secretKey: + '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC', + balance: convertToHexValue(25000000000000000000), + }, + ], + }; + + it('should respond to the request provider event', async function () { + await withFixtures( + { + dapp: true, + fixtures: new FixtureBuilder() + .withPermissionControllerConnectedToTestDapp() + .build(), + ganacheOptions, + title: this.test.title, + }, + async ({ driver }) => { + await driver.navigate(); + await driver.fill('#password', 'correct horse battery staple'); + await driver.press('#password', driver.Key.ENTER); + + await openDapp(driver); + await driver.executeScript(` + window.announceProviderEvents = [] + window.addEventListener( + "eip6963:announceProvider", + (event) => { + window.announceProviderEvents.push(event) + } + ); + window.dispatchEvent(new Event("eip6963:requestProvider")); + `); + const announceProviderEvents = await driver.executeScript(` + return window.announceProviderEvents.map(event => { + return { + type: event.type, + detail: { + ...event.detail, + provider: Boolean(event.detail.provider) + } + } + }) + `); + + assert.match(announceProviderEvents[0].detail.info.uuid, UUID_V4_REGEX); + delete announceProviderEvents[0].detail.info.uuid; + assert.match( + announceProviderEvents[0].detail.info.icon, + SVG_DATA_URI_REGEX, + ); + delete announceProviderEvents[0].detail.info.icon; + assert.deepStrictEqual(announceProviderEvents, [ + { + type: 'eip6963:announceProvider', + detail: { + info: { + name: 'MetaMask Main', + rdns: 'io.metamask', + }, + provider: true, + }, + }, + ]); + + const request = JSON.stringify({ + jsonrpc: '2.0', + method: 'eth_chainId', + params: [], + id: 0, + }); + const result = await driver.executeScript(` + return window.announceProviderEvents[0].detail.provider.request(${request}) + `); + + assert.equal(result, '0x539'); + }, + ); + }); +}); diff --git a/yarn.lock b/yarn.lock index b3560238caac..3dae9a891314 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4597,9 +4597,9 @@ __metadata: languageName: node linkType: hard -"@metamask/providers@npm:^13.0.0": - version: 13.0.0 - resolution: "@metamask/providers@npm:13.0.0" +"@metamask/providers@npm:^13.0.0, @metamask/providers@npm:^13.1.0": + version: 13.1.0 + resolution: "@metamask/providers@npm:13.1.0" dependencies: "@metamask/json-rpc-engine": "npm:^7.1.1" "@metamask/object-multiplex": "npm:^1.1.0" @@ -4612,7 +4612,7 @@ __metadata: is-stream: "npm:^2.0.0" json-rpc-middleware-stream: "npm:^4.2.1" webextension-polyfill: "npm:^0.10.0" - checksum: c6fe1936741a2b782960f0a12148602754fabe55b75707fd80716d5a42ca4f672d838d1ba36873e96f4afdc5360247e3b737c95b7ca532a74e135218cb65033a + checksum: 2ee1802d92d0fd2c733c5d98137e4f92c77a42fbf008a6b19de25d84d48321502031b82aa66501c4ce9c7e863a82c1866fe477349b48ba1151d4b8c2114233e8 languageName: node linkType: hard @@ -23840,7 +23840,7 @@ __metadata: "@metamask/phishing-warning": "npm:^2.1.0" "@metamask/post-message-stream": "npm:^6.2.0" "@metamask/ppom-validator": "npm:^0.5.0" - "@metamask/providers": "npm:^13.0.0" + "@metamask/providers": "npm:^13.1.0" "@metamask/rate-limit-controller": "npm:^3.0.0" "@metamask/rpc-methods": "npm:^3.0.0" "@metamask/safe-event-emitter": "npm:^2.0.0" From 5deed0e3d6001860f5f7c2460df707f2051d010f Mon Sep 17 00:00:00 2001 From: Howard Braham Date: Thu, 12 Oct 2023 00:21:00 -0700 Subject: [PATCH 108/219] fix: flaky E2E "tests notifications for verified token on 1 source and price difference" (#21271) I have been watching CircleCI failures on develop since #21110 was merged, and all of them have been Out of Memory errors, except this one that I think I missed because it's misreporting. CircleCI reports that it failed on "tests a notification for not enough balance," but that doesn't make any sense -- that would be failing with an AssertionError on a test that has no assertions. I believe it's actually failing on "tests notifications for verified token on 1 source and price difference," so I made a tiny change on that test to stabilize. --- test/e2e/swaps/swaps-notifications.spec.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/e2e/swaps/swaps-notifications.spec.js b/test/e2e/swaps/swaps-notifications.spec.js index 5a5a4abf44a5..1c8ab9488c1c 100644 --- a/test/e2e/swaps/swaps-notifications.spec.js +++ b/test/e2e/swaps/swaps-notifications.spec.js @@ -1,4 +1,3 @@ -const { strict: assert } = require('assert'); const { withFixtures } = require('../helpers'); const { withFixturesOptions, @@ -89,11 +88,10 @@ describe('Swaps - notifications @no-mmi', function () { swapTo: 'INUINU', skipCounter: true, }); - const swapButton = await driver.findElement({ + await driver.findClickableElement({ text: 'Swap', tag: 'button', }); - assert.equal(await swapButton.isEnabled(), true); }, ); }); From dad057b0a5e98806762385a6c2d3497195818a27 Mon Sep 17 00:00:00 2001 From: Gauthier Petetin Date: Thu, 12 Oct 2023 09:25:25 -0300 Subject: [PATCH 109/219] Github action to check issue body matches issues templates and add labels to issue when needed (#21184) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This PR introduces a new Github action, to achieve the following: 1. Check if issue matches an existing issue template ('general-issue.yml' or 'bug-report.yml') 2. Add an `INVALID-ISSUE-TEMPLATE` label in case issue doesn't match any of the templates 3. Add an `external-contributor` label in case issue was created by someone external to the MetaMask organisation 4. Add a `regression-prod-x.y.z` label when possible, when `x.y.z` value can be extracted from 'bug-report.yml' template We will be able to leverage `regression-prod-x.y.z` and `external-contributor` labels to improve our bug triage process and our metrics collection. [Same PR for Mobile repo](https://github.com/MetaMask/metamask-mobile/pull/7379) ## **Manual testing steps** 1. Go on this [test repo](https://github.com/gauthierpetetin-test/repo_test/issues/new?assignees=&labels=type-bug&projects=&template=bug-report-extension.yml&title=%5BBug%5D%3A+) 2. Fill the bug report issue form 6. Make sure the release version you indicate in the form has x.y.z format 7. Click on "Submit new issue" 8. Wait for ~30s and 2 new labels shall appear on the issue you just created (`regression-prod-x.y.z` and `external-contributor`) 9. Edit the issue's description by indicating a different release version 10. Wait for ~30s and the `regression-prod-x.y.z` shall be updated accordingly 11. Edit the issue by deleting the whole description 12. Wait for ~30s and the `INVALID-ISSUE-TEMPLATE` shall be added ## **Screenshots/Recordings** ### **Before** NA ### **After** https://recordit.co/Sq7fvCwkr5 ## **Related issues** Fixes https://github.com/MetaMask/MetaMask-planning/issues/1409 ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [x] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [x] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [x] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [x] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --------- Co-authored-by: Brad Decker --- .../check-issue-template-and-add-labels.ts | 551 ++++++++++++++++++ .../check-issue-template-and-add-labels.yml | 31 + package.json | 1 + 3 files changed, 583 insertions(+) create mode 100644 .github/scripts/check-issue-template-and-add-labels.ts create mode 100644 .github/workflows/check-issue-template-and-add-labels.yml diff --git a/.github/scripts/check-issue-template-and-add-labels.ts b/.github/scripts/check-issue-template-and-add-labels.ts new file mode 100644 index 000000000000..298b94f79071 --- /dev/null +++ b/.github/scripts/check-issue-template-and-add-labels.ts @@ -0,0 +1,551 @@ +import * as core from '@actions/core'; +import { context, getOctokit } from '@actions/github'; +import { GitHub } from '@actions/github/lib/utils'; + +// A labelable object can be a pull request or an issue +interface Labelable { + id: string; + number: number; + repoOwner: string; + repoName: string; + body: string; + author: string; + labels: { + id: string; + name: string; + }[]; +} + +// An enum, to categorise issues, based on template it matches +enum IssueType { + GeneralIssue, + BugReport, + None, +} + +// Titles of our two issues templates ('general-issue.yml' and 'bug-report.yml' issue) +const generalIssueTemplateTitles = [ + '### What is this about?', + '### Scenario', + '### Design', + '### Technical Details', + '### Threat Modeling Framework', + '### Acceptance Criteria', + '### References', +]; +const bugReportTemplateTitles = [ + '### Describe the bug', + '### Expected behavior', + '### Screenshots', + '### Steps to reproduce', + '### Error messages or log output', + '### Version', + '### Build type', + '### Browser', + '### Operating system', + '### Hardware wallet', + '### Additional context', + '### Severity' +]; + +// External contributor label +const externalContributorLabelName = `external-contributor`; +const externalContributorLabelColor = 'B60205'; // red +const externalContributorLabelDescription = `Issue or PR created by user outside MetaMask organisation`; + +// Craft invalid issue template label +const invalidIssueTemplateLabelName = `INVALID-ISSUE-TEMPLATE`; +const invalidIssueTemplateLabelColor = 'B60205'; // red +const invalidIssueTemplateLabelDescription = `Issue's body doesn't match any issue template.`; + +main().catch((error: Error): void => { + console.error(error); + process.exit(1); +}); + +async function main(): Promise { + // "GITHUB_TOKEN" is an automatically generated, repository-specific access token provided by GitHub Actions. + // We can't use "GITHUB_TOKEN" here, as its permissions don't allow neither to create new labels + // nor to retrieve the list of organisations a user belongs to. + // In our case, we may want to create "regression-prod-x.y.z" label when it doesn't already exist. + // We may also want to retrieve the list of organisations a user belongs to. + // As a consequence, we need to create our own "LABEL_TOKEN" with "repo" and "read:org" permissions. + // Such a token allows both to create new labels and fetch user's list of organisations. + const personalAccessToken = process.env.LABEL_TOKEN; + if (!personalAccessToken) { + core.setFailed('LABEL_TOKEN not found'); + process.exit(1); + } + + // Retrieve pull request info from context + const issueRepoOwner = context.repo.owner; + const issueRepoName = context.repo.repo; + const issueNumber = context.payload.issue?.number; + if (!issueNumber) { + core.setFailed('Issue number not found'); + process.exit(1); + } + + // Initialise octokit, required to call Github GraphQL API + const octokit: InstanceType = getOctokit(personalAccessToken, { + previews: ['bane'], // The "bane" preview is required for adding, updating, creating and deleting labels. + }); + + // Retrieve issue + const issue: Labelable = await retrieveIssue( + octokit, + issueRepoOwner, + issueRepoName, + issueNumber, + ); + + // Add external contributor label to the issue, in case author is not part of the MetaMask organisation + await addExternalContributorLabel(octokit, issue); + + // Check if issue's body matches one of the two issues templates ('general-issue.yml' or 'bug-report.yml') + const issueType: IssueType = extractIssueTypeFromIssueBody(issue.body); + + if (issueType === IssueType.GeneralIssue) { + console.log("Issue matches 'general-issue.yml' template."); + await removeInvalidIssueTemplateLabelIfPresent(octokit, issue); + } else if (issueType === IssueType.BugReport) { + console.log("Issue matches 'bug-report.yml' template."); + await removeInvalidIssueTemplateLabelIfPresent(octokit, issue); + + // Extract release version from issue body (is existing) + const releaseVersion = extractReleaseVersionFromIssueBody(issue.body); + + // Add regression prod label to the issue if release version was found is issue body + if (releaseVersion) { + await addRegressionProdLabel(octokit, releaseVersion, issue); + } else { + console.log( + `No release version was found in body of issue ${issue?.number}.`, + ); + } + } else { + const errorMessage = + "Issue body does not match any of expected templates ('general-issue.yml' or 'bug-report.yml')."; + console.log(errorMessage); + + // Add invalid issue template label to the issue, in case issue doesn't match any template + await addInvalidIssueTemplateLabel(octokit, issue); + + // Github action shall fail in case issue doesn't match any template + throw new Error(errorMessage); + } +} + +// This helper function checks if issue's body matches one of the two issues templates ('general-issue.yml' or 'bug-report.yml'). +function extractIssueTypeFromIssueBody(issueBody: string): IssueType { + let missingGeneralIssueTitle: boolean = false; + for (const title of generalIssueTemplateTitles) { + if (!issueBody.includes(title)) { + missingGeneralIssueTitle = true; + } + } + + let missingBugReportTitle: boolean = false; + for (const title of bugReportTemplateTitles) { + if (!issueBody.includes(title)) { + missingBugReportTitle = true; + } + } + + if (!missingGeneralIssueTitle) { + return IssueType.GeneralIssue; + } else if (!missingBugReportTitle) { + return IssueType.BugReport; + } else { + return IssueType.None; + } +} + +// This helper function checks if issue's body has a bug report format. +function extractReleaseVersionFromIssueBody( + issueBody: string, +): string | undefined { + // Remove newline characters + const cleanedIssueBody = issueBody.replace(/\r?\n/g, ' '); + + // Extract version from the cleaned issue body + const regex = /### Version\s+((.*?)(?= |$))/; + const versionMatch = cleanedIssueBody.match(regex); + const version = versionMatch?.[1]; + + // Check if version is in the format x.y.z + if (version && !/^(\d+\.)?(\d+\.)?(\*|\d+)$/.test(version)) { + throw new Error('Version is not in the format x.y.z'); + } + + return version; +} + +// This function adds the "external-contributor" label to the issue, in case author is not part of the MetaMask organisation +async function addExternalContributorLabel( + octokit: InstanceType, + issue: Labelable, +): Promise { + // If author is not part of the MetaMask organisation + if (!(await userBelongsToMetaMaskOrg(octokit, issue?.author))) { + // Add external contributor label to the issue + await addLabelToLabelable( + octokit, + issue, + externalContributorLabelName, + externalContributorLabelColor, + externalContributorLabelDescription, + ); + } +} + +// This function adds the correct "regression-prod-x.y.z" label to the issue, and removes other ones +async function addRegressionProdLabel( + octokit: InstanceType, + releaseVersion: string, + issue: Labelable, +): Promise { + // Craft regression prod label to add + const regressionProdLabelName = `regression-prod-${releaseVersion}`; + const regressionProdLabelColor = '5319E7'; // violet + const regressionProdLabelDescription = `Regression bug that was found in production in release ${releaseVersion}`; + + let regressionProdLabelFound: boolean = false; + const regressionProdLabelsToBeRemoved: { + id: string; + name: string; + }[] = []; + + // Loop over issue's labels, to see if regression labels are either missing, or to be removed + issue?.labels?.forEach((label) => { + if (label?.name === regressionProdLabelName) { + regressionProdLabelFound = true; + } else if (label?.name?.startsWith('regression-prod-')) { + regressionProdLabelsToBeRemoved.push(label); + } + }); + + // Add regression prod label to the issue if missing + if (regressionProdLabelFound) { + console.log( + `Issue ${issue?.number} already has ${regressionProdLabelName} label.`, + ); + } else { + console.log( + `Add ${regressionProdLabelName} label to issue ${issue?.number}.`, + ); + await addLabelToLabelable( + octokit, + issue, + regressionProdLabelName, + regressionProdLabelColor, + regressionProdLabelDescription, + ); + } + + // Remove other regression prod label from the issue + await Promise.all( + regressionProdLabelsToBeRemoved.map((label) => { + removeLabelFromLabelable(octokit, issue, label?.id); + }), + ); +} + +// This function adds the "INVALID-ISSUE-TEMPLATE" label to the issue +async function addInvalidIssueTemplateLabel( + octokit: InstanceType, + issue: Labelable, +): Promise { + // Add label to issue + await addLabelToLabelable( + octokit, + issue, + invalidIssueTemplateLabelName, + invalidIssueTemplateLabelColor, + invalidIssueTemplateLabelDescription, + ); +} + +// This function removes the "INVALID-ISSUE-TEMPLATE" label from the issue, in case it's present +async function removeInvalidIssueTemplateLabelIfPresent( + octokit: InstanceType, + issue: Labelable, +): Promise { + // Check if label is present on issue + const label = issue?.labels?.find( + (label) => label.name === invalidIssueTemplateLabelName, + ); + + if (label?.id) { + // Remove label from issue + await removeLabelFromLabelable(octokit, issue, label.id); + } +} + +// This function retrieves the repo +async function retrieveRepo( + octokit: InstanceType, + repoOwner: string, + repoName: string, +): Promise { + const retrieveRepoQuery = ` + query RetrieveRepo($repoOwner: String!, $repoName: String!) { + repository(owner: $repoOwner, name: $repoName) { + id + } + } +`; + + const retrieveRepoResult: { + repository: { + id: string; + }; + } = await octokit.graphql(retrieveRepoQuery, { + repoOwner, + repoName, + }); + + const repoId = retrieveRepoResult?.repository?.id; + + return repoId; +} + +// This function retrieves the label on a specific repo +async function retrieveLabel( + octokit: InstanceType, + repoOwner: string, + repoName: string, + labelName: string, +): Promise { + const retrieveLabelQuery = ` + query RetrieveLabel($repoOwner: String!, $repoName: String!, $labelName: String!) { + repository(owner: $repoOwner, name: $repoName) { + label(name: $labelName) { + id + } + } + } + `; + + const retrieveLabelResult: { + repository: { + label: { + id: string; + }; + }; + } = await octokit.graphql(retrieveLabelQuery, { + repoOwner, + repoName, + labelName, + }); + + const labelId = retrieveLabelResult?.repository?.label?.id; + + return labelId; +} + +// This function creates the label on a specific repo +async function createLabel( + octokit: InstanceType, + repoId: string, + labelName: string, + labelColor: string, + labelDescription: string, +): Promise { + const createLabelMutation = ` + mutation CreateLabel($repoId: ID!, $labelName: String!, $labelColor: String!, $labelDescription: String) { + createLabel(input: {repositoryId: $repoId, name: $labelName, color: $labelColor, description: $labelDescription}) { + label { + id + } + } + } + `; + + const createLabelResult: { + createLabel: { + label: { + id: string; + }; + }; + } = await octokit.graphql(createLabelMutation, { + repoId, + labelName, + labelColor, + labelDescription, + }); + + const labelId = createLabelResult?.createLabel?.label?.id; + + return labelId; +} + +// This function creates or retrieves the label on a specific repo +async function createOrRetrieveLabel( + octokit: InstanceType, + repoOwner: string, + repoName: string, + labelName: string, + labelColor: string, + labelDescription: string, +): Promise { + // Check if label already exists on the repo + let labelId = await retrieveLabel(octokit, repoOwner, repoName, labelName); + + // If label doesn't exist on the repo, create it + if (!labelId) { + // Retrieve PR's repo + const repoId = await retrieveRepo(octokit, repoOwner, repoName); + + // Create label on repo + labelId = await createLabel( + octokit, + repoId, + labelName, + labelColor, + labelDescription, + ); + } + + return labelId; +} + +// This function retrieves the issue on a specific repo +async function retrieveIssue( + octokit: InstanceType, + repoOwner: string, + repoName: string, + issueNumber: number, +): Promise { + const retrieveIssueQuery = ` + query GetIssue($repoOwner: String!, $repoName: String!, $issueNumber: Int!) { + repository(owner: $repoOwner, name: $repoName) { + issue(number: $issueNumber) { + id + body + author { + login + } + labels(first: 100) { + nodes { + id + name + } + } + } + } + } + `; + + const retrieveIssueResult: { + repository: { + issue: { + id: string; + body: string; + author: { + login: string; + }; + labels: { + nodes: { + id: string; + name: string; + }[]; + }; + }; + }; + } = await octokit.graphql(retrieveIssueQuery, { + repoOwner, + repoName, + issueNumber, + }); + + const issue: Labelable = { + id: retrieveIssueResult?.repository?.issue?.id, + number: issueNumber, + repoOwner: repoOwner, + repoName: repoName, + body: retrieveIssueResult?.repository?.issue?.body, + author: retrieveIssueResult?.repository?.issue?.author?.login, + labels: retrieveIssueResult?.repository?.issue?.labels?.nodes, + }; + + return issue; +} + +// This function adds label to a labelable object (i.e. a pull request or an issue) +async function addLabelToLabelable( + octokit: InstanceType, + labelable: Labelable, + labelName: string, + labelColor: string, + labelDescription: string, +): Promise { + // Retrieve label from the labelable's repo, or create label if required + const labelId = await createOrRetrieveLabel( + octokit, + labelable?.repoOwner, + labelable?.repoName, + labelName, + labelColor, + labelDescription, + ); + + const addLabelsToLabelableMutation = ` + mutation AddLabelsToLabelable($labelableId: ID!, $labelIds: [ID!]!) { + addLabelsToLabelable(input: {labelableId: $labelableId, labelIds: $labelIds}) { + clientMutationId + } + } + `; + + await octokit.graphql(addLabelsToLabelableMutation, { + labelableId: labelable?.id, + labelIds: [labelId], + }); +} + +// This function removes a label from a labelable object (i.e. a pull request or an issue) +async function removeLabelFromLabelable( + octokit: InstanceType, + labelable: Labelable, + labelId: string, +): Promise { + const removeLabelsFromLabelableMutation = ` + mutation RemoveLabelsFromLabelable($labelableId: ID!, $labelIds: [ID!]!) { + removeLabelsFromLabelable(input: {labelableId: $labelableId, labelIds: $labelIds}) { + clientMutationId + } + } + `; + + await octokit.graphql(removeLabelsFromLabelableMutation, { + labelableId: labelable?.id, + labelIds: [labelId], + }); +} + +// This function checks if user belongs to MetaMask organization on Github +async function userBelongsToMetaMaskOrg( + octokit: InstanceType, + username: string, +): Promise { + const userBelongsToMetaMaskOrgQuery = ` + query UserBelongsToMetaMaskOrg($login: String!) { + user(login: $login) { + organization(login: "MetaMask") { + id + } + } + } + `; + + const userBelongsToMetaMaskOrgResult: { + user: { + organization: { + id: string; + }; + }; + } = await octokit.graphql(userBelongsToMetaMaskOrgQuery, { login: username }); + + return Boolean(userBelongsToMetaMaskOrgResult?.user?.organization?.id); +} diff --git a/.github/workflows/check-issue-template-and-add-labels.yml b/.github/workflows/check-issue-template-and-add-labels.yml new file mode 100644 index 000000000000..11baaeafbc60 --- /dev/null +++ b/.github/workflows/check-issue-template-and-add-labels.yml @@ -0,0 +1,31 @@ +name: Check issue template and add labels + +on: + issues: + types: + - opened + - edited + +jobs: + add-regression-prod-label: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v3 + with: + fetch-depth: 1 # This retrieves only the latest commit. + + - name: Set up Node.js + uses: actions/setup-node@v3 + with: + node-version-file: '.nvmrc' + cache: yarn + + - name: Install dependencies + run: yarn --immutable + + - name: Check issue template and add labels + id: check-issue-template-and-add-labels + env: + LABEL_TOKEN: ${{ secrets.LABEL_TOKEN }} + run: npm run check-issue-template-and-add-labels diff --git a/package.json b/package.json index 8004357acee1..363aae905204 100644 --- a/package.json +++ b/package.json @@ -103,6 +103,7 @@ "add-release-label-to-pr-and-linked-issues": "ts-node ./.github/scripts/add-release-label-to-pr-and-linked-issues.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-issue-template-and-add-labels": "ts-node ./.github/scripts/check-issue-template-and-add-labels.ts", "audit": "yarn npm audit --recursive --environment production --severity moderate" }, "resolutions": { From 346758d78881a3892824df465b57ae0bfd941a26 Mon Sep 17 00:00:00 2001 From: Marina Boboc <120041701+benjisclowder@users.noreply.github.com> Date: Thu, 12 Oct 2023 15:33:37 +0300 Subject: [PATCH 110/219] adding new test scenarios (#21321) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** _Write a short description of the changes included in this pull request, also include relevant motivation and context. Have in mind the following questions:_ _1. What is the reason for the change?_ _2. What is the improvement/solution?_ Adding test scenarios for manual QA of the tokens flows. ## **Manual testing steps** _1. Step1:_ _2. Step2:_ _3. ..._ ## **Screenshots/Recordings** _If applicable, add screenshots and/or recordings to visualize the before and after of your change._ ### **Before** _[screenshot]_ ### **After** _[screenshot]_ ## **Related issues** _Fixes #???_ https://github.com/MetaMask/metamask-extension/issues/20256 and https://github.com/MetaMask/metamask-extension/issues/20255 ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've clearly explained: - [ ] What problem this PR is solving. - [ ] How this problem was solved. - [ ] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --------- Co-authored-by: Peter <53189696+PeterYinusa@users.noreply.github.com> --- .../import erc20 token origin dapp.csv | 14 ++++++++++++++ .../importing erc721 token origin dapp.csv | 17 +++++++++++++++++ .../scenarios/9. metrics/send event metrics.csv | 3 +-- 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 test/scenarios/4. tokens/import erc20 token origin dapp.csv create mode 100644 test/scenarios/4. tokens/importing erc721 token origin dapp.csv diff --git a/test/scenarios/4. tokens/import erc20 token origin dapp.csv b/test/scenarios/4. tokens/import erc20 token origin dapp.csv new file mode 100644 index 000000000000..eb07d85b05c9 --- /dev/null +++ b/test/scenarios/4. tokens/import erc20 token origin dapp.csv @@ -0,0 +1,14 @@ +Step,Test steps,Test data,Expected result,Notes +1,Open the extension.,,The Welcome Back screen is shown., +2,Proceed to Unlock the wallet.,password (8 characters min).,The Ether balance is shown on the overview. The wallet address is shown on the overview. The selected network is Ethereum Mainnet. , +3,Switch networks to a test network.,e.g. Sepolia,The Sepolia balance is shown on the overview. The wallet address is shown on the overview. The selected network is Sepolia., +4,Open the test dapp in another tab.,https://metamask.github.io/test-dapp/,, +5,Proceed to connect with MetaMask. ,,, +6,Connect with the current account. ,,, +7,Deploy the token contract.,,, +8,Confirm the transaction and wait for it to complete.,,, +9,Switch to the wallet and open the activity list item.,,"The transaction status, nonce, amount, gas and total are shown in the item details.", +10,Proceed to view the transaction on the block explorer.,,The block explorer opens in a new tab., +11,"In the test dapp, proceed to add token to wallet. ",,"A prompt is shown with the token icon, symbol and amount.", +12,Confirm the addition of the custom token.,,, +13,Switch back to the wallet.,,The token is shown in the wallet's tokens list. The token icon is shown. The token symbol is shown. The token balance is shown. , \ No newline at end of file diff --git a/test/scenarios/4. tokens/importing erc721 token origin dapp.csv b/test/scenarios/4. tokens/importing erc721 token origin dapp.csv new file mode 100644 index 000000000000..d00cdcabf4c9 --- /dev/null +++ b/test/scenarios/4. tokens/importing erc721 token origin dapp.csv @@ -0,0 +1,17 @@ +Step,Test steps,Test data,Expected result,Notes +1,Open the extension.,,The Welcome Back screen is shown., +2,Proceed to Unlock the wallet.,password (8 characters min).,The Ether balance is shown on the overview. The wallet address is shown on the overview. The selected network is Ethereum Mainnet. , +3,Switch networks to a test network.,e.g. Sepolia,The Sepolia balance is shown on the overview. The wallet address is shown on the overview. The selected network is Sepolia., +4,Open the test dapp in another tab.,https://metamask.github.io/test-dapp/,, +5,Proceed to connect with MetaMask. ,,, +6,Connect with the current account. ,,, +7,Deploy the NFT contract. ,,, +8,Confirm the transaction and wait for it to complete.,,, +9,Proceed to mint NFT. ,,,"If NFT with token ID #3 must be watched, amount of NFTs minted should be equal to or greater than 3." +10,Confirm the transaction and wait for it to complete.,,, +11,Switch to the wallet and open the activity list item.,,"The transaction status, recipient's address, nonce, amount, gas and total are shown in the item details.", +12,Proceed to view the transaction on the block explorer.,,The block explorer opens in a new tab., +13,"In the test dapp, enter the NFT ID you wish to watch. ",e.g. 3,, +14,Proceed to Watch NFT. ,,, +15,Confirm the addition of the custom token.,,, +16,Switch back to the wallet.,,The NFT is shown in the wallets NFTs list. The NFT image is shown.,OpenSea API in Security & Privacy Settings has to be enabled for the NFT image to be shown. \ No newline at end of file diff --git a/test/scenarios/9. metrics/send event metrics.csv b/test/scenarios/9. metrics/send event metrics.csv index f320dfb9cfd0..f01dca35c5cb 100644 --- a/test/scenarios/9. metrics/send event metrics.csv +++ b/test/scenarios/9. metrics/send event metrics.csv @@ -15,5 +15,4 @@ Chrome: chrome://extensions/",The extensions page is displayed., 10,Select the Network tab.,,, 11,Keep the background console open and head over to the wallet.,,, 12,Proceed to General in the Settings menu.,,"A request to Sentry is made in the networks tab under payload - https://api.segment.io/v1/batch. -The request payload is valid JSON and contains the name General Settings Page.", -,,,, +The request payload is valid JSON and contains the name General Settings Page.", \ No newline at end of file From c6cfecb93260e1b8cb1848e4ad37d96f10d1c4b1 Mon Sep 17 00:00:00 2001 From: Monte Lai Date: Thu, 12 Oct 2023 20:53:24 +0800 Subject: [PATCH 111/219] Update copy for account snaps (#21322) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This PR updates the copy of Account Snap related content. ## **Manual testing steps** 1. Click on Settings Icon 2. Click Experimental 3. See the Accounts Snaps section for the new copy Part 2. 1. Click on the account picker 2. Click on `Add account or hardware wallet` 3. See the new copy for the `Add account Snap` 4. Click on `Add account Snap` 5. See the copy for the `Add Account Snap Page` ## **Screenshots/Recordings** ### **Before** ![image](https://github.com/MetaMask/metamask-extension/assets/96463427/5fa19e4e-cdf1-4597-ae7d-eda01224d0a5) ![image](https://github.com/MetaMask/metamask-extension/assets/96463427/c819bdec-e5cd-4ce4-b519-61e8fcaa3a75) ![image](https://github.com/MetaMask/metamask-extension/assets/96463427/9532ba13-1100-4591-9a4a-3b60b7423df8) ![image](https://github.com/MetaMask/metamask-extension/assets/96463427/6c2b939f-e555-4172-ab10-ccbefdc28b23) ![image](https://github.com/MetaMask/metamask-extension/assets/96463427/a3ccb929-864a-4d9c-8cf0-7745282ff56d) ![image](https://github.com/MetaMask/metamask-extension/assets/96463427/23e912bf-1a68-4b66-9327-790c12110097) ![image](https://github.com/MetaMask/metamask-extension/assets/96463427/252bff56-2b66-4a19-af7f-0381dc4ac83f) ![image](https://github.com/MetaMask/metamask-extension/assets/96463427/7c63a5ca-1a64-434d-9bdd-2414557cbb04) ### **After** Screenshot 2023-10-11 at 22 35 36 Screenshot 2023-10-11 at 22 36 53 Screenshot 2023-10-11 at 22 36 40 Screenshot 2023-10-11 at 22 39 54 ## **Related issues** Resolves https://github.com/MetaMask/accounts-planning/issues/103 ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [x] I’ve indicated what issue this PR is linked to: Fixes #??? - [x] I’ve included tests if applicable. - [x] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [x] I’ve properly set the pull request status: - [x] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --------- Co-authored-by: Daniel Rocha <68558152+danroc@users.noreply.github.com> --- app/_locales/de/messages.json | 2 +- app/_locales/el/messages.json | 2 +- app/_locales/en/messages.json | 21 +++++++++++-------- app/_locales/es/messages.json | 2 +- app/_locales/fr/messages.json | 2 +- app/_locales/hi/messages.json | 2 +- app/_locales/id/messages.json | 2 +- app/_locales/ja/messages.json | 2 +- app/_locales/ko/messages.json | 2 +- app/_locales/pt/messages.json | 2 +- app/_locales/ru/messages.json | 2 +- app/_locales/tl/messages.json | 2 +- app/_locales/tr/messages.json | 2 +- app/_locales/vi/messages.json | 2 +- app/_locales/zh_CN/messages.json | 2 +- .../settings-add-snap-account-toggle.spec.js | 13 +++++------- .../add-snap-account-modal.tsx | 2 +- .../new-snap-account-page.scss | 18 ++++++++++++---- .../new-snap-account-page.test.tsx | 4 ++-- .../new-snap-account-page.tsx | 15 +++++++++++-- .../snap-account-detail-page.test.tsx.snap | 2 +- .../__snapshots__/snap-card.test.tsx.snap | 2 +- .../keyring-snaps/snap-card/snap-card.scss | 4 ---- .../keyring-snaps/snap-card/snap-card.tsx | 1 - .../experimental-tab.test.js.snap | 6 +++--- 25 files changed, 66 insertions(+), 50 deletions(-) diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index 764968de8fcd..c82fc509d096 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -3913,7 +3913,7 @@ }, "snapCreateAccountTitle": { "message": "Ein $1-Konto erstellen", - "description": "Title of the Create Snap Account Page, $1 is the text using a different color" + "description": "Title of the Create Account Snap Page, $1 is the text using a different color" }, "snapCreateAccountTitle2": { "message": "Snap", diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index 42c3d6cd7487..65e49c18d128 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -3913,7 +3913,7 @@ }, "snapCreateAccountTitle": { "message": "Δημιουργήστε έναν $1 λογαριασμό", - "description": "Title of the Create Snap Account Page, $1 is the text using a different color" + "description": "Title of the Create Account Snap Page, $1 is the text using a different color" }, "snapCreateAccountTitle2": { "message": "snap", diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index e8879b0ee578..d7d50a8af307 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -183,6 +183,9 @@ "addAccount": { "message": "Add account" }, + "addAccountSnapModalHeader": { + "message": "Add Account Snap" + }, "addAcquiredTokens": { "message": "Add the tokens you've acquired using MetaMask" }, @@ -281,10 +284,10 @@ "message": "Discover options to keep your account secure with MetaMask Snaps" }, "addSnapAccountToggle": { - "message": "Enable \"Add Snap account\"" + "message": "Enable \"Add account Snap (Beta)\"" }, "addSnapAccountsDescription": { - "message": "Turning on this feature will give you the option to add a Snap account right from your account list. If you install a Snap account, remember that it is a third-party service." + "message": "Turning on this feature will give you the option to add the new Beta account Snaps right from your account list. If you install an account Snap, remember that it is a third-party service." }, "addSuggestedNFTs": { "message": "Add suggested NFTs" @@ -4053,7 +4056,7 @@ "description": "The token symbol that is being approved" }, "settingAddSnapAccount": { - "message": "Add snap account" + "message": "Add account Snap" }, "settings": { "message": "Settings" @@ -4168,7 +4171,7 @@ "message": "Account removed" }, "snapAccounts": { - "message": "Snap accounts" + "message": "Account Snaps" }, "snapAccountsDescription": { "message": "Accounts controlled by third-party Snaps." @@ -4185,14 +4188,14 @@ "description": "This is shown when a snap shows transaction insight information in the confirmation UI. $1 is a link to the snap's settings page with the link text being the name of the snap." }, "snapCreateAccountSubtitle": { - "message": "Choose how to secure your new account using MetaMask Snaps." + "message": "Choose how to secure your new account using MetaMask Snaps. If you install an account Snap, remember that it is a third-party service." }, "snapCreateAccountTitle": { - "message": "Create a $1 account", - "description": "Title of the Create Snap Account Page, $1 is the text using a different color" + "message": "Create an account $1 (Beta)", + "description": "Title of the Create Account Snap Page, $1 is the text using a different color" }, "snapCreateAccountTitle2": { - "message": "snap", + "message": "Snap", "description": "$1 of the snapCreateAccountTitle" }, "snapCreatedByMetaMask": { @@ -4220,7 +4223,7 @@ "message": "Website" }, "snapDetailsCreateASnapAccount": { - "message": "Create a Snap Account" + "message": "Add an account Snap (Beta)" }, "snapDetailsInstalled": { "message": "Installed" diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 3dd2740de760..c83605862e23 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -3913,7 +3913,7 @@ }, "snapCreateAccountTitle": { "message": "Cree una cuenta $1", - "description": "Title of the Create Snap Account Page, $1 is the text using a different color" + "description": "Title of the Create Account Snap Page, $1 is the text using a different color" }, "snapCreateAccountTitle2": { "message": "snap", diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index 2d2a638b4b8a..455a116d0a08 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -3913,7 +3913,7 @@ }, "snapCreateAccountTitle": { "message": "Créer un compte $1", - "description": "Title of the Create Snap Account Page, $1 is the text using a different color" + "description": "Title of the Create Account Snap Page, $1 is the text using a different color" }, "snapCreateAccountTitle2": { "message": "snap", diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index 2834bd054c56..fb8c1fec8908 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -3913,7 +3913,7 @@ }, "snapCreateAccountTitle": { "message": "एक $1 वाला अकाउंट बनाएं", - "description": "Title of the Create Snap Account Page, $1 is the text using a different color" + "description": "Title of the Create Account Snap Page, $1 is the text using a different color" }, "snapCreateAccountTitle2": { "message": "Snap", diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index c7f8a9b468bf..9361a0d18725 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -3913,7 +3913,7 @@ }, "snapCreateAccountTitle": { "message": "Buat akun $1", - "description": "Title of the Create Snap Account Page, $1 is the text using a different color" + "description": "Title of the Create Account Snap Page, $1 is the text using a different color" }, "snapCreateAccountTitle2": { "message": "snap", diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index 1a656b5ec45c..b025ee475416 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -3913,7 +3913,7 @@ }, "snapCreateAccountTitle": { "message": "$1アカウントの作成", - "description": "Title of the Create Snap Account Page, $1 is the text using a different color" + "description": "Title of the Create Account Snap Page, $1 is the text using a different color" }, "snapCreateAccountTitle2": { "message": "snap", diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index a047ff34bc4c..59ecbc154bc7 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -3913,7 +3913,7 @@ }, "snapCreateAccountTitle": { "message": "$1 계정 생성", - "description": "Title of the Create Snap Account Page, $1 is the text using a different color" + "description": "Title of the Create Account Snap Page, $1 is the text using a different color" }, "snapCreateAccountTitle2": { "message": "스냅", diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index 33f7c3d92b17..48ace43cb738 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -3913,7 +3913,7 @@ }, "snapCreateAccountTitle": { "message": "Criar uma conta $1", - "description": "Title of the Create Snap Account Page, $1 is the text using a different color" + "description": "Title of the Create Account Snap Page, $1 is the text using a different color" }, "snapCreateAccountTitle2": { "message": "snap", diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index eb89c8594173..1b242bfc3a2c 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -3913,7 +3913,7 @@ }, "snapCreateAccountTitle": { "message": "Создать новый счет $1", - "description": "Title of the Create Snap Account Page, $1 is the text using a different color" + "description": "Title of the Create Account Snap Page, $1 is the text using a different color" }, "snapCreateAccountTitle2": { "message": "snap", diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json index 64d45fe62cc0..e9b90c2a6a35 100644 --- a/app/_locales/tl/messages.json +++ b/app/_locales/tl/messages.json @@ -3913,7 +3913,7 @@ }, "snapCreateAccountTitle": { "message": "Gumawa ng $1 account", - "description": "Title of the Create Snap Account Page, $1 is the text using a different color" + "description": "Title of the Create Account Snap Page, $1 is the text using a different color" }, "snapCreateAccountTitle2": { "message": "snap", diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index 5547fc1462ed..288ebc27d591 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -3913,7 +3913,7 @@ }, "snapCreateAccountTitle": { "message": "Bir $1 hesabı oluştur", - "description": "Title of the Create Snap Account Page, $1 is the text using a different color" + "description": "Title of the Create Account Snap Page, $1 is the text using a different color" }, "snapCreateAccountTitle2": { "message": "snap", diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index 04801fc95699..c2947dc6f564 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -3913,7 +3913,7 @@ }, "snapCreateAccountTitle": { "message": "Tạo tài khoản $1", - "description": "Title of the Create Snap Account Page, $1 is the text using a different color" + "description": "Title of the Create Account Snap Page, $1 is the text using a different color" }, "snapCreateAccountTitle2": { "message": "Snap", diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index 02e27cc66ac0..02bd5041a838 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -3913,7 +3913,7 @@ }, "snapCreateAccountTitle": { "message": "创建 $1 账户", - "description": "Title of the Create Snap Account Page, $1 is the text using a different color" + "description": "Title of the Create Account Snap Page, $1 is the text using a different color" }, "snapCreateAccountTitle2": { "message": "snap", diff --git a/test/e2e/accounts/settings-add-snap-account-toggle.spec.js b/test/e2e/accounts/settings-add-snap-account-toggle.spec.js index c9d2dbfd5010..316a86c4dd0f 100644 --- a/test/e2e/accounts/settings-add-snap-account-toggle.spec.js +++ b/test/e2e/accounts/settings-add-snap-account-toggle.spec.js @@ -3,7 +3,7 @@ const { withFixtures } = require('../helpers'); const FixtureBuilder = require('../fixture-builder'); describe('Add snap account experimental settings', function () { - it('switch "Enable Add snap account" to on', async function () { + it('switch "Enable Add account snap" to on', async function () { await withFixtures( { fixtures: new FixtureBuilder().build(), @@ -21,7 +21,7 @@ describe('Add snap account experimental settings', function () { '[data-testid="multichain-account-menu-popover-action-button"]', ); await driver.assertElementNotPresent({ - text: 'Add snap account', + text: 'Add account Snap', tag: 'button', }); await driver.clickElement('.mm-box button[aria-label="Close"]'); @@ -34,11 +34,8 @@ describe('Add snap account experimental settings', function () { await driver.clickElement({ text: 'Experimental', tag: 'div' }); // Switch "Enable Add snap account" to on. - const toggle = await driver.findElement( - '[data-testid="add-snap-account-toggle"]', - ); - await driver.scrollToElement(toggle); - await driver.clickElement('[data-testid="add-snap-account-toggle"]'); + const toggles = await driver.findClickableElements('.toggle-button'); + await toggles[2].click(); // Make sure the "Add snap account" button is visible. await driver.clickElement('[data-testid="account-menu-icon"]'); @@ -47,7 +44,7 @@ describe('Add snap account experimental settings', function () { ); assert.equal( await driver.isElementPresentAndVisible({ - text: 'Add snap account', + text: 'Add account Snap', tag: 'button', }), true, diff --git a/ui/pages/keyring-snaps/add-snap-account-modal/add-snap-account-modal.tsx b/ui/pages/keyring-snaps/add-snap-account-modal/add-snap-account-modal.tsx index 2aee96aca582..38bc8dca83a6 100644 --- a/ui/pages/keyring-snaps/add-snap-account-modal/add-snap-account-modal.tsx +++ b/ui/pages/keyring-snaps/add-snap-account-modal/add-snap-account-modal.tsx @@ -33,7 +33,7 @@ export default function AddSnapAccountModal({ - {t('settingAddSnapAccount')} + {t('addAccountSnapModalHeader')} { describe('NewSnapAccountPage', () => { it('should render the popup', async () => { const { getByText } = renderComponent(); - const popupTitle = getByText(messages.settingAddSnapAccount.message); + const popupTitle = getByText(messages.addAccountSnapModalHeader.message); expect(popupTitle).toBeInTheDocument(); const closeButton = getByText(messages.getStarted.message); @@ -94,7 +94,7 @@ describe('NewSnapAccountPage', () => { it('should render the texts', async () => { const { getByText } = renderComponent(); expect( - getByText(messages.settingAddSnapAccount.message), + getByText(messages.addAccountSnapModalHeader.message), ).toBeInTheDocument(); expect( getByText(messages.addSnapAccountModalDescription.message), diff --git a/ui/pages/keyring-snaps/new-snap-account-page/new-snap-account-page.tsx b/ui/pages/keyring-snaps/new-snap-account-page/new-snap-account-page.tsx index e3a9d2f67436..bcf6cde83272 100644 --- a/ui/pages/keyring-snaps/new-snap-account-page/new-snap-account-page.tsx +++ b/ui/pages/keyring-snaps/new-snap-account-page/new-snap-account-page.tsx @@ -15,6 +15,7 @@ import { FlexDirection, FlexWrap, JustifyContent, + TextAlign, TextColor, TextVariant, } from '../../../helpers/constants/design-system'; @@ -77,7 +78,11 @@ export default function NewSnapAccountPage() { ); return ( - + { await hidePopup(); @@ -104,7 +109,12 @@ export default function NewSnapAccountPage() { , ])} - + {t('snapCreateAccountSubtitle')} @@ -114,6 +124,7 @@ export default function NewSnapAccountPage() { gap={4} padding={[0, 10, 0, 10]} className="snap-account-cards" + marginBottom={'auto'} > {Object.values(snapRegistryList).map( (snap: SnapDetails, index: number) => { diff --git a/ui/pages/keyring-snaps/snap-account-detail-page/__snapshots__/snap-account-detail-page.test.tsx.snap b/ui/pages/keyring-snaps/snap-account-detail-page/__snapshots__/snap-account-detail-page.test.tsx.snap index aef5def3d131..493193fe1468 100644 --- a/ui/pages/keyring-snaps/snap-account-detail-page/__snapshots__/snap-account-detail-page.test.tsx.snap +++ b/ui/pages/keyring-snaps/snap-account-detail-page/__snapshots__/snap-account-detail-page.test.tsx.snap @@ -14,7 +14,7 @@ exports[`SnapAccountDetails should take a snapshot 1`] = ` ); diff --git a/ui/pages/confirmation/templates/__snapshots__/snap-account-redirect.test.js.snap b/ui/pages/confirmation/templates/__snapshots__/snap-account-redirect.test.js.snap new file mode 100644 index 000000000000..53a20ffea165 --- /dev/null +++ b/ui/pages/confirmation/templates/__snapshots__/snap-account-redirect.test.js.snap @@ -0,0 +1,220 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`snap-account-redirect confirmation should match snapshot 1`] = ` +
+
+
+
+
+
+
+ ? +
+
+
+ +
+
+
+
+
+

+

+

+
+ +
+
+ +
+
+
+ + +
+
+
+
+`; diff --git a/ui/pages/confirmation/templates/index.js b/ui/pages/confirmation/templates/index.js index 7199833c2b54..4698e66f18e5 100644 --- a/ui/pages/confirmation/templates/index.js +++ b/ui/pages/confirmation/templates/index.js @@ -10,6 +10,7 @@ import { import { SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES } from '../../../../shared/constants/app'; import createSnapAccount from './create-snap-account'; import removeSnapAccount from './remove-snap-account'; +import snapAccountRedirect from './snap-account-redirect'; ///: END:ONLY_INCLUDE_IN import addEthereumChain from './add-ethereum-chain'; import switchEthereumChain from './switch-ethereum-chain'; @@ -37,6 +38,8 @@ const APPROVAL_TEMPLATES = { createSnapAccount, [SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES.confirmAccountRemoval]: removeSnapAccount, + [SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES.showSnapAccountRedirect]: + snapAccountRedirect, ///: END:ONLY_INCLUDE_IN }; diff --git a/ui/pages/confirmation/templates/snap-account-redirect.js b/ui/pages/confirmation/templates/snap-account-redirect.js new file mode 100644 index 000000000000..a878613d47b8 --- /dev/null +++ b/ui/pages/confirmation/templates/snap-account-redirect.js @@ -0,0 +1,44 @@ +function getValues(pendingApproval, t, actions, _history) { + const { snapName } = pendingApproval; + const { url, message, isBlockedUrl } = pendingApproval.requestData; + + const getConditionalProps = () => { + if ( + url !== undefined && + url !== null && + url.length > 0 && + isBlockedUrl === false + ) { + return { + submitText: t('goToSite'), + onSubmit: () => + actions.resolvePendingApproval(pendingApproval.id, true), + }; + } + return {}; + }; + + return { + content: [ + { + element: 'SnapAccountRedirect', + key: 'snap-account-redirect', + props: { + url, + message, + snapName, + isBlockedUrl, + }, + }, + ], + cancelText: t('close'), + onCancel: () => actions.resolvePendingApproval(pendingApproval.id, false), + ...getConditionalProps(), + }; +} + +const createSnapAccount = { + getValues, +}; + +export default createSnapAccount; diff --git a/ui/pages/confirmation/templates/snap-account-redirect.test.js b/ui/pages/confirmation/templates/snap-account-redirect.test.js new file mode 100644 index 000000000000..261dcc7af6d8 --- /dev/null +++ b/ui/pages/confirmation/templates/snap-account-redirect.test.js @@ -0,0 +1,68 @@ +import React from 'react'; +import configureMockStore from 'redux-mock-store'; +import thunk from 'redux-thunk'; +import { waitFor } from '@testing-library/react'; + +import Confirmation from '../confirmation'; +import { renderWithProvider } from '../../../../test/lib/render-helpers'; +import { SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES } from '../../../../shared/constants/app'; + +const middleware = [thunk]; + +const mockApprovalId = 1; +const mockSnapName = 'Test Snap Account Name'; +const mockUrl = 'https://metamask.github.io/test-snap'; +const mockMessage = 'Test Snap Account Message'; +const mockIsBlockedUrl = false; +const providerConfig = { + chainId: '0x5', +}; +const mockApproval = { + id: mockApprovalId, + snapName: mockSnapName, + requestData: { + url: mockUrl, + message: mockMessage, + isBlockedUrl: mockIsBlockedUrl, + }, +}; +const mockBaseStore = { + metamask: { + pendingApprovals: { + [mockApprovalId]: mockApproval, + }, + approvalFlows: [], + subjectMetadata: {}, + providerConfig, + }, +}; + +describe('snap-account-redirect confirmation', () => { + it('should match snapshot', async () => { + const testStore = { + metamask: { + ...mockBaseStore.metamask, + pendingApprovals: { + [mockApprovalId]: { + ...mockApproval, + type: SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES.showSnapAccountRedirect, + }, + }, + }, + }; + const store = configureMockStore(middleware)(testStore); + const { container, getByText } = renderWithProvider( + , + store, + ); + await waitFor(() => { + expect(getByText(`Finish signing`)).toBeInTheDocument(); + expect( + getByText(`Follow the instructions from ${mockSnapName}`), + ).toBeInTheDocument(); + expect(getByText('Test Snap Account Message')).toBeInTheDocument(); + expect(container.querySelector('.callout')).toBeDefined(); + expect(container).toMatchSnapshot(); + }); + }); +}); diff --git a/ui/pages/snap-account-redirect/__snapshots__/create-snap-redirect.test.tsx.snap b/ui/pages/snap-account-redirect/__snapshots__/create-snap-redirect.test.tsx.snap new file mode 100644 index 000000000000..e6c61312d708 --- /dev/null +++ b/ui/pages/snap-account-redirect/__snapshots__/create-snap-redirect.test.tsx.snap @@ -0,0 +1,88 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[` renders the url and message when provided and isBlockedUrl is false 1`] = ` +
+ +
+`; diff --git a/ui/pages/snap-account-redirect/components/index.ts b/ui/pages/snap-account-redirect/components/index.ts new file mode 100644 index 000000000000..1e98846345b8 --- /dev/null +++ b/ui/pages/snap-account-redirect/components/index.ts @@ -0,0 +1 @@ +export { default as SnapAccountRedirectContent } from './snap-account-redirect-context'; diff --git a/ui/pages/snap-account-redirect/components/redirect-url-icon.tsx b/ui/pages/snap-account-redirect/components/redirect-url-icon.tsx new file mode 100644 index 000000000000..4d5e605dde24 --- /dev/null +++ b/ui/pages/snap-account-redirect/components/redirect-url-icon.tsx @@ -0,0 +1,27 @@ +import React from 'react'; +import { + ButtonIcon, + ButtonIconSize, + IconName, +} from '../../../components/component-library'; +import { IconColor } from '../../../helpers/constants/design-system'; + +interface RedirectUrlIconProps { + url: string; +} + +const RedirectUrlIcon = ({ url }: RedirectUrlIconProps) => { + return ( + { + global.platform.openTab({ url }); + }} + iconName={IconName.Export} + color={IconColor.primaryDefault} + size={ButtonIconSize.Sm} + ariaLabel={''} + /> + ); +}; + +export default React.memo(RedirectUrlIcon); diff --git a/ui/pages/snap-account-redirect/components/snap-account-redirect-context.tsx b/ui/pages/snap-account-redirect/components/snap-account-redirect-context.tsx new file mode 100644 index 000000000000..bda5d5e5625a --- /dev/null +++ b/ui/pages/snap-account-redirect/components/snap-account-redirect-context.tsx @@ -0,0 +1,99 @@ +import React from 'react'; +import { + BannerAlert, + BannerAlertSeverity, + Box, + Button, + ButtonSize, + ButtonVariant, + Text, +} from '../../../components/component-library'; +import { SnapAccountRedirectProps } from '../snap-account-redirect'; +import { + AlignItems, + Display, + FlexDirection, + JustifyContent, + TextAlign, + TextVariant, +} from '../../../helpers/constants/design-system'; +import { useI18nContext } from '../../../hooks/useI18nContext'; +import SnapAccountRedirectMessage from './snap-account-redirect-message'; + +const SnapAccountRedirectContent = ({ + url, + snapName, + isBlockedUrl, + message, +}: SnapAccountRedirectProps) => { + const t = useI18nContext(); + const learnMoreAboutBlockedUrls = + 'https://support.metamask.io/hc/en-us/articles/4428045875483--Deceptive-site-ahead-when-trying-to-connect-to-a-site'; + + return ( + + + + {t('snapAccountRedirectFinishSigningTitle')} + + {isBlockedUrl ? ( + + + + {t('snapUrlIsBlocked', [ + , + ])} + + + + ) : null} + {isBlockedUrl === false ? ( + + {t('snapAccountRedirectSiteDescription', [snapName])} + + ) : null} + {(url.length > 0 || message.length > 0) && isBlockedUrl === false ? ( + + ) : null} + + + ); +}; + +export default SnapAccountRedirectContent; diff --git a/ui/pages/snap-account-redirect/components/snap-account-redirect-message.tsx b/ui/pages/snap-account-redirect/components/snap-account-redirect-message.tsx new file mode 100644 index 000000000000..6446172c133e --- /dev/null +++ b/ui/pages/snap-account-redirect/components/snap-account-redirect-message.tsx @@ -0,0 +1,36 @@ +import React from 'react'; +import { Display, TextVariant } from '../../../helpers/constants/design-system'; +import { Box, Text } from '../../../components/component-library'; +import { SnapAccountRedirectProps } from '../snap-account-redirect'; +import { SnapDelineator } from '../../../components/app/snaps/snap-delineator'; +import UrlDisplayBox from './url-display-box'; + +const SnapAccountRedirectMessage = ({ + snapName, + url, + message, +}: Pick) => { + /* eslint-disable no-negated-condition */ + return ( + + {message !== '' ? ( + + {message} + + ) : null} + {url.length > 0 ? ( + + + + ) : null} + + ); +}; + +export default React.memo(SnapAccountRedirectMessage); diff --git a/ui/pages/snap-account-redirect/components/url-display-box.tsx b/ui/pages/snap-account-redirect/components/url-display-box.tsx new file mode 100644 index 000000000000..221844f7efb9 --- /dev/null +++ b/ui/pages/snap-account-redirect/components/url-display-box.tsx @@ -0,0 +1,39 @@ +import React from 'react'; +import { SnapAccountRedirectProps } from '../snap-account-redirect'; +import { + AlignItems, + BackgroundColor, + BorderRadius, + BorderColor, + Display, + TextColor, + TextVariant, +} from '../../../helpers/constants/design-system'; +import { Box, Text } from '../../../components/component-library'; +import RedirectUrlIcon from './redirect-url-icon'; + +const UrlDisplayBox = ({ url }: Pick) => { + return ( + + + {url} + + + + ); +}; + +export default React.memo(UrlDisplayBox); diff --git a/ui/pages/snap-account-redirect/create-snap-redirect.test.tsx b/ui/pages/snap-account-redirect/create-snap-redirect.test.tsx new file mode 100644 index 000000000000..1683b954812a --- /dev/null +++ b/ui/pages/snap-account-redirect/create-snap-redirect.test.tsx @@ -0,0 +1,97 @@ +import React from 'react'; +import { render } from '@testing-library/react'; +import { SnapAccountRedirect } from '.'; + +// If you're using some kind of global variable (like `global.platform` in your component), you might want to mock it. +global.platform = { + openTab: jest.fn(), +}; + +const mockUrl = 'https://metamask.github.io/snap-simple-keyring/1.0.0/'; +const mockSnapName = 'Snap Simple Keyring'; +const mockMessage = 'Redirecting to Snap Simple Keyring'; + +describe('', () => { + it('renders the url and message when provided and isBlockedUrl is false', () => { + const { getByTestId, container } = render( + , + ); + + expect(getByTestId('snap-account-redirect-content-title')); + expect(getByTestId('snap-account-redirect-message')).toHaveTextContent( + mockMessage, + ); + expect( + getByTestId('snap-account-redirect-url-display-box'), + ).toHaveTextContent(mockUrl); + expect(container).toMatchSnapshot(); + }); + + it('renders alert banner and does not render message or url when isBlockedUrl is true', () => { + const { queryByTestId } = render( + , + ); + + expect( + queryByTestId('snap-account-redirect-content-description'), + ).toBeNull(); + expect(queryByTestId('snap-account-redirect-message')).toBeNull(); + expect(queryByTestId('snap-account-redirect-url-display-box')).toBeNull(); + expect( + queryByTestId('snap-account-redirect-content-blocked-url-banner'), + ).toBeDefined(); + }); + + it('does not render URL display box when URL is empty', () => { + const { queryByTestId } = render( + , + ); + expect(queryByTestId('snap-account-redirect-message')).toHaveTextContent( + mockMessage, + ); + expect(queryByTestId('snap-account-redirect-url-display-box')).toBeNull(); + }); + + it('does not render message when message is empty', () => { + const { queryByTestId } = render( + , + ); + + expect( + queryByTestId('snap-account-redirect-url-display-box'), + ).toHaveTextContent(mockUrl); + expect(queryByTestId('snap-account-redirect-message')).toBeNull(); + }); + + it('does not render message/url box when message and url are empty', () => { + const { queryByTestId } = render( + , + ); + expect(queryByTestId('snap-account-redirect-message-container')).toBeNull(); + }); +}); diff --git a/ui/pages/snap-account-redirect/index.ts b/ui/pages/snap-account-redirect/index.ts new file mode 100644 index 000000000000..2c62a3b40670 --- /dev/null +++ b/ui/pages/snap-account-redirect/index.ts @@ -0,0 +1 @@ +export { default as SnapAccountRedirect } from './snap-account-redirect'; diff --git a/ui/pages/snap-account-redirect/snap-account-redirect.stories.tsx b/ui/pages/snap-account-redirect/snap-account-redirect.stories.tsx new file mode 100644 index 000000000000..a9cb210597f2 --- /dev/null +++ b/ui/pages/snap-account-redirect/snap-account-redirect.stories.tsx @@ -0,0 +1,38 @@ +import React from 'react'; +import { Meta } from '@storybook/react'; +import SnapAccountRedirect from './snap-account-redirect'; + +export default { + title: 'Components/UI/SnapAccountRedirect', + argTypes: { + snapName: { + control: { + type: 'text', + }, + }, + isBlockedUrl: { + control: { + type: 'boolean', + }, + }, + url: { + control: { + type: 'text', + }, + }, + message: { + control: { + type: 'text', + }, + }, + }, + args: { + snapName: 'Snap Simple Keyring', + isBlockedUrl: false, + url: 'https://metamask.github.io/snap-simple-keyring/0.2.4/', + message: 'Redirecting to Snap Simple Keyring', + }, +} as Meta; + +export const DefaultStory = (args) => ; +DefaultStory.storyName = 'Default'; diff --git a/ui/pages/snap-account-redirect/snap-account-redirect.tsx b/ui/pages/snap-account-redirect/snap-account-redirect.tsx new file mode 100644 index 000000000000..fccfe2c5acd1 --- /dev/null +++ b/ui/pages/snap-account-redirect/snap-account-redirect.tsx @@ -0,0 +1,53 @@ +import React from 'react'; +import { Box } from '../../components/component-library'; +import { + AlignItems, + BlockSize, + BorderStyle, + Display, + FlexDirection, +} from '../../helpers/constants/design-system'; +import { SnapAccountRedirectContent } from './components'; + +export interface SnapAccountRedirectProps { + url: string; + snapName: string; + isBlockedUrl: boolean; + message: string; +} + +const SnapAccountRedirect = ({ + url, + snapName, + isBlockedUrl, + message, +}: SnapAccountRedirectProps) => { + return ( + + + + + + ); +}; + +export default SnapAccountRedirect; diff --git a/yarn.lock b/yarn.lock index 1fc9841661e5..81ad6956cf55 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4144,9 +4144,9 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-snap-keyring@npm:^1.0.0-rc.1": - version: 1.0.0-rc.1 - resolution: "@metamask/eth-snap-keyring@npm:1.0.0-rc.1" +"@metamask/eth-snap-keyring@npm:1.0.0-rc.2": + version: 1.0.0-rc.2 + resolution: "@metamask/eth-snap-keyring@npm:1.0.0-rc.2" dependencies: "@ethereumjs/tx": "npm:^4.2.0" "@metamask/eth-sig-util": "npm:^7.0.0" @@ -4156,7 +4156,7 @@ __metadata: "@types/uuid": "npm:^9.0.1" superstruct: "npm:^1.0.3" uuid: "npm:^9.0.0" - checksum: afb50a755823e249e80731da7e2f3ab4246b900020135eb4c3c657d663f2d44a7a6281f29a9a453f5975bd493e4322bede3d5bea0c94871dda8ce0ceced5f186 + checksum: 02e3392db1e0bbea0aac8fa99e55ad2490d99d23568fb1587a31a1510ff41aad3bc29ec5514256e727ec2c6a34c111327600cee8a2d48e4745bdc8665d30770b languageName: node linkType: hard @@ -8240,6 +8240,13 @@ __metadata: languageName: node linkType: hard +"@types/webextension-polyfill@npm:^0.10.4": + version: 0.10.4 + resolution: "@types/webextension-polyfill@npm:0.10.4" + checksum: f5aa3d24d3214a1d82328dc14c2f9b8d07d36e149281968959992f29ef78017dc1cf6055759d18ce46d29528d22b87fcfb30a289432382704869c7f3e1962f52 + languageName: node + linkType: hard + "@types/ws@npm:*": version: 8.2.2 resolution: "@types/ws@npm:8.2.2" @@ -23816,7 +23823,7 @@ __metadata: "@metamask/eth-json-rpc-middleware": "npm:^11.0.0" "@metamask/eth-keyring-controller": "npm:^13.0.1" "@metamask/eth-ledger-bridge-keyring": "npm:^0.15.0" - "@metamask/eth-snap-keyring": "npm:^1.0.0-rc.1" + "@metamask/eth-snap-keyring": "npm:1.0.0-rc.2" "@metamask/eth-token-tracker": "npm:^4.0.0" "@metamask/eth-trezor-keyring": "npm:^1.1.0" "@metamask/etherscan-link": "npm:^2.2.0" @@ -23908,6 +23915,7 @@ __metadata: "@types/sinon": "npm:^10.0.13" "@types/w3c-web-hid": "npm:^1.0.3" "@types/watchify": "npm:^3.11.1" + "@types/webextension-polyfill": "npm:^0.10.4" "@types/yargs": "npm:^17.0.8" "@typescript-eslint/eslint-plugin": "npm:^5.30.7" "@typescript-eslint/parser": "npm:^5.30.7" From 87eb9dc6d367eabe23040c98ce70c8cf74631803 Mon Sep 17 00:00:00 2001 From: Daniel Rocha Date: Fri, 13 Oct 2023 02:52:14 +0200 Subject: [PATCH 121/219] feat: enable account Snaps in stable (#21272) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This PR enables the account Snaps on stable. Dependencies and tasks: - [x] https://github.com/MetaMask/metamask-extension/pull/21246 - [x] https://github.com/MetaMask/metamask-extension/pull/21255 - [x] https://github.com/MetaMask/metamask-extension/pull/21312 - [x] Update `keyring-api` to 1.0.0 - [x] Update `eth-snap-keyring` to 1.0.0 - [x] Update Simple Snap Keyring (SSK) to 1.0.1 - [x] Add SSK to allowlist (done at: https://github.com/MetaMask/snaps-registry/pull/228) - [x] :red_circle: **REVERT:** https://github.com/MetaMask/metamask-extension/pull/21272/commits/f65bef1400adb84fd77eb034cf8d6b4875d1f13d (done at: https://github.com/MetaMask/metamask-extension/pull/21272/commits/0de84720bd5a57362bd7511b7fd2f9034038ff5d) - [x] Add missing description of `endowment:keyring` ## **Manual testing steps** 1. Install MetaMask stable. 2. Go to . 3. Install the Simple Snap Keyring. 4. Create a new account. 5. Use this new account in the [Test Dapp](https://metamask.github.io/test-dapp/). ## **Screenshots/Recordings** ![image](https://github.com/MetaMask/metamask-extension/assets/68558152/ecb3c238-37e8-4309-b2b4-57e52ac826a6) ## **Related issues** Fixes: https://github.com/MetaMask/accounts-planning/issues/82 ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [x] I’ve indicated what issue this PR is linked to: Fixes #??? - [x] I’ve included tests if applicable. - [x] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [x] I’ve properly set the pull request status: - [x] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --------- Co-authored-by: gantunesr Co-authored-by: MetaMask Bot --- app/_locales/en/messages.json | 8 +++ app/scripts/lib/setupSentry.js | 4 ++ builds.yml | 1 + lavamoat/browserify/main/policy.json | 69 +++++++++++++++++++ package.json | 4 +- shared/constants/snaps/permissions.ts | 7 +- .../settings-add-snap-account-toggle.spec.js | 55 --------------- test/e2e/accounts/utils.ts | 2 +- test/e2e/helpers.js | 8 ++- test/e2e/run-all.js | 4 -- ...rs-after-init-opt-in-background-state.json | 2 + .../errors-after-init-opt-in-ui-state.json | 2 + ui/helpers/utils/permission.js | 9 ++- .../experimental-tab.component.js | 2 +- yarn.lock | 22 +++--- 15 files changed, 119 insertions(+), 80 deletions(-) delete mode 100644 test/e2e/accounts/settings-add-snap-account-toggle.spec.js diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 0ed8f24abf99..6430aad110ae 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -3402,6 +3402,14 @@ "message": "Let this Snap access your preferred language from your MetaMask settings. This can be used to localize and display the Snap's content using your language.", "description": "An extended description for the `snap_getLocale` permission" }, + "permission_keyring": { + "message": "Allow requests for adding and controlling Ethereum accounts", + "description": "The description for the `endowment:keyring` permission" + }, + "permission_keyringDescription": { + "message": "Let this Snap receive requests to add or remove accounts, plus sign and transact on behalf of these accounts.", + "description": "An extended description for the `endowment:keyring` permission" + }, "permission_lifecycleHooks": { "message": "Use lifecycle hooks.", "description": "The description for the `endowment:lifecycle-hooks` permission" diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js index 2b908647deea..ab6fa1c7c943 100644 --- a/app/scripts/lib/setupSentry.js +++ b/app/scripts/lib/setupSentry.js @@ -320,6 +320,10 @@ export const SENTRY_UI_STATE = { pendingTokens: false, welcomeScreenSeen: true, useSafeChainsListValidation: true, + ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) + addSnapAccountEnabled: false, + snapsAddSnapAccountModalDismissed: false, + ///: END:ONLY_INCLUDE_IN }, unconnectedAccount: true, }; diff --git a/builds.yml b/builds.yml index 8f2060ed9c82..27ab9d8c7611 100644 --- a/builds.yml +++ b/builds.yml @@ -17,6 +17,7 @@ buildTypes: features: - build-main - snaps + - keyring-snaps # Additional env variables that are specific to this build env: - INFURA_PROD_PROJECT_ID diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 91343fef0725..86ffcc1a40e7 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -1154,6 +1154,50 @@ "koa>content-disposition>safe-buffer": true } }, + "@metamask/eth-snap-keyring": { + "globals": { + "console.error": true + }, + "packages": { + "@ethereumjs/tx": true, + "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true, + "@metamask/eth-snap-keyring>@metamask/utils": true, + "@metamask/eth-snap-keyring>uuid": true, + "@metamask/keyring-api": true, + "superstruct": true, + "webpack>events": true + } + }, + "@metamask/eth-snap-keyring>@metamask/eth-sig-util": { + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@metamask/assets-controllers>@metamask/abi-utils": true, + "@metamask/eth-snap-keyring>@metamask/utils": true, + "browserify>buffer": true, + "eth-sig-util>ethereumjs-util>ethjs-util": true, + "eth-sig-util>tweetnacl": true, + "eth-sig-util>tweetnacl-util": true + } + }, + "@metamask/eth-snap-keyring>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/key-tree>@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true, + "superstruct": true + } + }, + "@metamask/eth-snap-keyring>uuid": { + "globals": { + "crypto": true + } + }, "@metamask/eth-token-tracker": { "globals": { "console.warn": true @@ -1595,6 +1639,31 @@ "TextEncoder": true } }, + "@metamask/keyring-api": { + "packages": { + "@metamask/keyring-api>@metamask/utils": true, + "@metamask/keyring-api>uuid": true, + "superstruct": true + } + }, + "@metamask/keyring-api>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/key-tree>@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true, + "superstruct": true + } + }, + "@metamask/keyring-api>uuid": { + "globals": { + "crypto": true + } + }, "@metamask/keyring-controller": { "packages": { "@metamask/base-controller": true, diff --git a/package.json b/package.json index ee7ad8ccb66f..6d953b32351d 100644 --- a/package.json +++ b/package.json @@ -248,7 +248,7 @@ "@metamask/eth-json-rpc-middleware": "^11.0.0", "@metamask/eth-keyring-controller": "^13.0.1", "@metamask/eth-ledger-bridge-keyring": "^0.15.0", - "@metamask/eth-snap-keyring": "1.0.0-rc.2", + "@metamask/eth-snap-keyring": "^1.0.0", "@metamask/eth-token-tracker": "^4.0.0", "@metamask/eth-trezor-keyring": "^1.1.0", "@metamask/etherscan-link": "^2.2.0", @@ -256,7 +256,7 @@ "@metamask/gas-fee-controller": "^6.0.1", "@metamask/jazzicon": "^2.0.0", "@metamask/key-tree": "^9.0.0", - "@metamask/keyring-api": "^1.0.0-rc.1", + "@metamask/keyring-api": "^1.0.0", "@metamask/keyring-controller": "^8.0.1", "@metamask/logging-controller": "^1.0.1", "@metamask/logo": "^3.1.2", diff --git a/shared/constants/snaps/permissions.ts b/shared/constants/snaps/permissions.ts index 26d1f8ee9417..cec2717315ac 100644 --- a/shared/constants/snaps/permissions.ts +++ b/shared/constants/snaps/permissions.ts @@ -9,6 +9,9 @@ export const EndowmentPermissions = Object.freeze({ 'endowment:lifecycle-hooks': 'endowment:lifecycle-hooks', 'endowment:name-lookup': 'endowment:name-lookup', ///: END:ONLY_INCLUDE_IN + ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) + 'endowment:keyring': 'endowment:keyring', + ///: END:ONLY_INCLUDE_IN } as const); // Methods / permissions in external packages that we are temporarily excluding. @@ -17,8 +20,6 @@ export const ExcludedSnapPermissions = Object.freeze({ ///: BEGIN:ONLY_INCLUDE_IN(build-main) snap_getLocale: 'This permission is still in development and therefore not available.', - snap_manageAccounts: - 'This permission is still in development and therefore not available.', ///: END:ONLY_INCLUDE_IN eth_accounts: 'eth_accounts is disabled. For more information please see https://github.com/MetaMask/snaps/issues/990.', @@ -26,8 +27,6 @@ export const ExcludedSnapPermissions = Object.freeze({ export const ExcludedSnapEndowments = Object.freeze({ ///: BEGIN:ONLY_INCLUDE_IN(build-main) - 'endowment:keyring': - 'This endowment is still in development therefore not available.', 'endowment:lifecycle-hooks': 'This endowment is experimental and therefore not available.', 'endowment:name-lookup': diff --git a/test/e2e/accounts/settings-add-snap-account-toggle.spec.js b/test/e2e/accounts/settings-add-snap-account-toggle.spec.js deleted file mode 100644 index 316a86c4dd0f..000000000000 --- a/test/e2e/accounts/settings-add-snap-account-toggle.spec.js +++ /dev/null @@ -1,55 +0,0 @@ -const { strict: assert } = require('assert'); -const { withFixtures } = require('../helpers'); -const FixtureBuilder = require('../fixture-builder'); - -describe('Add snap account experimental settings', function () { - it('switch "Enable Add account snap" to on', async function () { - await withFixtures( - { - fixtures: new FixtureBuilder().build(), - title: this.test.title, - failOnConsoleError: false, - }, - async ({ driver }) => { - await driver.navigate(); - await driver.fill('#password', 'correct horse battery staple'); - await driver.press('#password', driver.Key.ENTER); - - // Make sure the "Add snap account" button is not visible. - await driver.clickElement('[data-testid="account-menu-icon"]'); - await driver.clickElement( - '[data-testid="multichain-account-menu-popover-action-button"]', - ); - await driver.assertElementNotPresent({ - text: 'Add account Snap', - tag: 'button', - }); - await driver.clickElement('.mm-box button[aria-label="Close"]'); - - // Navigate to experimental settings. - await driver.clickElement( - '[data-testid="account-options-menu-button"]', - ); - await driver.clickElement({ text: 'Settings', tag: 'div' }); - await driver.clickElement({ text: 'Experimental', tag: 'div' }); - - // Switch "Enable Add snap account" to on. - const toggles = await driver.findClickableElements('.toggle-button'); - await toggles[2].click(); - - // Make sure the "Add snap account" button is visible. - await driver.clickElement('[data-testid="account-menu-icon"]'); - await driver.clickElement( - '[data-testid="multichain-account-menu-popover-action-button"]', - ); - assert.equal( - await driver.isElementPresentAndVisible({ - text: 'Add account Snap', - tag: 'button', - }), - true, - ); - }, - ); - }); -}); diff --git a/test/e2e/accounts/utils.ts b/test/e2e/accounts/utils.ts index f8652465faa5..7087531c91b2 100644 --- a/test/e2e/accounts/utils.ts +++ b/test/e2e/accounts/utils.ts @@ -1,2 +1,2 @@ export const TEST_SNAPS_SIMPLE_KEYRING_WEBSITE_URL = - 'https://metamask.github.io/snap-simple-keyring/0.4.0/'; + 'https://metamask.github.io/snap-simple-keyring/1.0.1/'; diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js index f7f626d990b3..6aafa80fe82d 100644 --- a/test/e2e/helpers.js +++ b/test/e2e/helpers.js @@ -769,7 +769,13 @@ async function validateContractDetails(driver) { await driver.clickElement({ text: 'Got it', tag: 'button' }); // Approve signing typed data - await driver.clickElement('[data-testid="signature-request-scroll-button"]'); + try { + await driver.clickElement( + '[data-testid="signature-request-scroll-button"]', + ); + } catch (error) { + // Ignore error if scroll button is not present + } await driver.delay(regularDelayMs); } diff --git a/test/e2e/run-all.js b/test/e2e/run-all.js index 0f9b3c07c973..cc73837fb2cf 100644 --- a/test/e2e/run-all.js +++ b/test/e2e/run-all.js @@ -139,10 +139,6 @@ async function main() { // These tests should only be run on Flask for now. if (buildType !== 'flask') { const filteredTests = [ - 'settings-add-snap-account-toggle.spec.js', - 'test-create-snap-account.spec.js', - 'test-remove-accounts-snap.spec.js', - 'test-snap-accounts.spec.js', 'test-snap-lifecycle.spec.js', 'test-snap-get-locale.spec.js', 'ppom-blockaid-alert.spec.js', diff --git a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json index 5aa7a4426840..eb204d4439b8 100644 --- a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json +++ b/test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json @@ -131,6 +131,7 @@ "use4ByteResolution": true, "useCurrencyRateCheck": true, "openSeaEnabled": false, + "addSnapAccountEnabled": "boolean", "advancedGasFee": {}, "featureFlags": {}, "incomingTransactionsPreferences": {}, @@ -151,6 +152,7 @@ "snapRegistryList": "object", "transactionSecurityCheckEnabled": false, "theme": "light", + "snapsAddSnapAccountModalDismissed": "boolean", "isLineaMainnetReleased": true, "selectedAddress": "string" }, diff --git a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json index b3fa6f2ba7e7..9a4696ee3d3e 100644 --- a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json +++ b/test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json @@ -91,6 +91,7 @@ "useNftDetection": false, "useCurrencyRateCheck": true, "openSeaEnabled": false, + "addSnapAccountEnabled": "boolean", "advancedGasFee": {}, "incomingTransactionsPreferences": {}, "lostIdentities": "object", @@ -101,6 +102,7 @@ "snapRegistryList": "object", "transactionSecurityCheckEnabled": false, "theme": "light", + "snapsAddSnapAccountModalDismissed": "boolean", "isLineaMainnetReleased": true, "selectedAddress": "string", "metaMetricsId": "fake-metrics-id", diff --git a/ui/helpers/utils/permission.js b/ui/helpers/utils/permission.js index df625c2028f1..c074879eb6eb 100644 --- a/ui/helpers/utils/permission.js +++ b/ui/helpers/utils/permission.js @@ -403,7 +403,14 @@ export const PERMISSION_DESCRIPTIONS = deepFreeze({ description: t('permission_manageAccountsDescription'), leftIcon: getLeftIcon(IconName.UserCircleAdd), rightIcon: null, - weight: 3, + weight: 2, + }), + [EndowmentPermissions['endowment:keyring']]: ({ t }) => ({ + label: t('permission_keyring'), + description: t('permission_keyringDescription'), + leftIcon: getLeftIcon(IconName.UserCircleAdd), + rightIcon: null, + weight: 2, }), ///: END:ONLY_INCLUDE_IN [UNKNOWN_PERMISSION]: ({ t, permissionName }) => ({ diff --git a/ui/pages/settings/experimental-tab/experimental-tab.component.js b/ui/pages/settings/experimental-tab/experimental-tab.component.js index 1bb39c6ba8aa..0d1bb2bb02bc 100644 --- a/ui/pages/settings/experimental-tab/experimental-tab.component.js +++ b/ui/pages/settings/experimental-tab/experimental-tab.component.js @@ -17,7 +17,7 @@ import { TextColor, TextVariant, Display, - ///: BEGIN:ONLY_INCLUDE_IN(blockaid,desktop) + ///: BEGIN:ONLY_INCLUDE_IN(blockaid,desktop,keyring-snaps) FontWeight, ///: END:ONLY_INCLUDE_IN ///: BEGIN:ONLY_INCLUDE_IN(desktop) diff --git a/yarn.lock b/yarn.lock index 81ad6956cf55..88c83f691df4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4144,19 +4144,19 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-snap-keyring@npm:1.0.0-rc.2": - version: 1.0.0-rc.2 - resolution: "@metamask/eth-snap-keyring@npm:1.0.0-rc.2" +"@metamask/eth-snap-keyring@npm:^1.0.0": + version: 1.0.0 + resolution: "@metamask/eth-snap-keyring@npm:1.0.0" dependencies: "@ethereumjs/tx": "npm:^4.2.0" "@metamask/eth-sig-util": "npm:^7.0.0" - "@metamask/keyring-api": "npm:^1.0.0-rc.1" + "@metamask/keyring-api": "npm:^1.0.0" "@metamask/snaps-controllers": "npm:^3.0.0" "@metamask/utils": "npm:^8.1.0" "@types/uuid": "npm:^9.0.1" superstruct: "npm:^1.0.3" uuid: "npm:^9.0.0" - checksum: 02e3392db1e0bbea0aac8fa99e55ad2490d99d23568fb1587a31a1510ff41aad3bc29ec5514256e727ec2c6a34c111327600cee8a2d48e4745bdc8665d30770b + checksum: 67a28b657f236da51e88fa127a73b3767bf9cab3b8562236aa77c7eb6cd3f73fad1b0d4f497c13c3afa1937d4e65057c7a72a1c6992033ac5b5042ab079aa072 languageName: node linkType: hard @@ -4272,9 +4272,9 @@ __metadata: languageName: node linkType: hard -"@metamask/keyring-api@npm:^1.0.0-rc.1": - version: 1.0.0-rc.1 - resolution: "@metamask/keyring-api@npm:1.0.0-rc.1" +"@metamask/keyring-api@npm:^1.0.0": + version: 1.0.0 + resolution: "@metamask/keyring-api@npm:1.0.0" dependencies: "@metamask/providers": "npm:^13.0.0" "@metamask/rpc-methods": "npm:^3.0.0" @@ -4284,7 +4284,7 @@ __metadata: "@types/uuid": "npm:^9.0.1" superstruct: "npm:^1.0.3" uuid: "npm:^9.0.0" - checksum: 60c418d430d01ec6e8a0ed8e6407bb62bcabfe6933d20f8efd31f82e9ae6d1f2b34009affc621f9bf2570d35fad20e4565305369232742b7830c11a27b053e6f + checksum: f7e5f4f043b53407752348ddc5825217ecacc3e80446c81fadf1ca4b1b27fc2f82ba9b71221769b241d43877762ed7c82ffc5caa550214134de30548810c7025 languageName: node linkType: hard @@ -23823,7 +23823,7 @@ __metadata: "@metamask/eth-json-rpc-middleware": "npm:^11.0.0" "@metamask/eth-keyring-controller": "npm:^13.0.1" "@metamask/eth-ledger-bridge-keyring": "npm:^0.15.0" - "@metamask/eth-snap-keyring": "npm:1.0.0-rc.2" + "@metamask/eth-snap-keyring": "npm:^1.0.0" "@metamask/eth-token-tracker": "npm:^4.0.0" "@metamask/eth-trezor-keyring": "npm:^1.1.0" "@metamask/etherscan-link": "npm:^2.2.0" @@ -23832,7 +23832,7 @@ __metadata: "@metamask/gas-fee-controller": "npm:^6.0.1" "@metamask/jazzicon": "npm:^2.0.0" "@metamask/key-tree": "npm:^9.0.0" - "@metamask/keyring-api": "npm:^1.0.0-rc.1" + "@metamask/keyring-api": "npm:^1.0.0" "@metamask/keyring-controller": "npm:^8.0.1" "@metamask/logging-controller": "npm:^1.0.1" "@metamask/logo": "npm:^3.1.2" From b9ec72e245313517df3c208272957f3e41734c6c Mon Sep 17 00:00:00 2001 From: Gustavo Antunes <17601467+gantunesr@users.noreply.github.com> Date: Thu, 12 Oct 2023 23:48:32 -0300 Subject: [PATCH 122/219] feat: add "Add Snap accounts" time-based feature flag (#21221) --- builds.yml | 1 + shared/modules/snap-accounts.test.ts | 23 +++++++++++++++++++ shared/modules/snap-accounts.ts | 21 +++++++++++++++++ .../experimental-tab.component.js | 20 +++++++++++++++- .../experimental-tab/experimental-tab.test.js | 12 ++++++++++ 5 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 shared/modules/snap-accounts.test.ts create mode 100644 shared/modules/snap-accounts.ts diff --git a/builds.yml b/builds.yml index 27ab9d8c7611..d60c758ad3ff 100644 --- a/builds.yml +++ b/builds.yml @@ -28,6 +28,7 @@ buildTypes: - REQUIRE_SNAPS_ALLOWLIST: true - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/3.0.0/index.html - KEYRING_SNAPS_REGISTRY_URL: https://metamask.github.io/keyring-snaps-registry/prod/registry.json + - KEYRING_SNAPS_AVAILABILITY_DATE: 02 Nov 2023 15:00:00 GMT # Main build uses the default browser manifest manifestOverrides: false diff --git a/shared/modules/snap-accounts.test.ts b/shared/modules/snap-accounts.test.ts new file mode 100644 index 000000000000..a1c14e302300 --- /dev/null +++ b/shared/modules/snap-accounts.test.ts @@ -0,0 +1,23 @@ +import { showSnapAccountExperimentalToggle } from './snap-accounts'; + +describe('showSnapAccountExperimentalToggle', () => { + beforeEach(() => { + process.env = Object.assign(process.env, { + KEYRING_SNAPS_AVAILABILITY_DATE: '02 Nov 2023 15:00:00 GMT', + }); + }); + + afterEach(() => { + delete process.env.KEYRING_SNAPS_AVAILABILITY_DATE; + }); + + it('returns false if the current date is before November 2, 2023', () => { + jest.useFakeTimers().setSystemTime(new Date(Date.UTC(2023, 9, 31, 5))); + expect(showSnapAccountExperimentalToggle()).toBe(false); + }); + + it('returns true if the current date is after November 2, 2023', () => { + jest.useFakeTimers().setSystemTime(new Date(Date.UTC(2023, 10, 3, 5))); + expect(showSnapAccountExperimentalToggle()).toBe(true); + }); +}); diff --git a/shared/modules/snap-accounts.ts b/shared/modules/snap-accounts.ts new file mode 100644 index 000000000000..42e1d281c6b8 --- /dev/null +++ b/shared/modules/snap-accounts.ts @@ -0,0 +1,21 @@ +///: BEGIN:ONLY_INCLUDE_IN(build-main) +/** + * Compares the current date to a specific date in UTC. + * This method is meant to be used in a specific case related to the + * Snap Accounts API. It should not be used in other cases. + * Note: Months are 0-indexed in JS, so 10 represents November + * + * @returns true if the current date is after the specified date, false otherwise. + */ +export function showSnapAccountExperimentalToggle(): boolean { + const keyringSnapsAvailabilityDate = + process.env.KEYRING_SNAPS_AVAILABILITY_DATE; + if (!keyringSnapsAvailabilityDate) { + return false; + } + + return ( + new Date().getTime() > new Date(keyringSnapsAvailabilityDate).getTime() + ); +} +///: END:ONLY_INCLUDE_IN diff --git a/ui/pages/settings/experimental-tab/experimental-tab.component.js b/ui/pages/settings/experimental-tab/experimental-tab.component.js index 0d1bb2bb02bc..9181d5dceec7 100644 --- a/ui/pages/settings/experimental-tab/experimental-tab.component.js +++ b/ui/pages/settings/experimental-tab/experimental-tab.component.js @@ -11,6 +11,9 @@ import { MetaMetricsEventName, ///: END:ONLY_INCLUDE_IN } from '../../../../shared/constants/metametrics'; +///: BEGIN:ONLY_INCLUDE_IN(build-main) +import { showSnapAccountExperimentalToggle } from '../../../../shared/modules/snap-accounts'; +///: END:ONLY_INCLUDE_IN import { Text, Box, Tag } from '../../../components/component-library'; import { @@ -263,7 +266,7 @@ export default class ExperimentalTab extends PureComponent { ///: END:ONLY_INCLUDE_IN ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) - renderKeyringSnapsToggle() { + keyringSnapsToggle() { const { t, trackEvent } = this.context; const { addSnapAccountEnabled, setAddSnapAccountEnabled } = this.props; @@ -336,6 +339,21 @@ export default class ExperimentalTab extends PureComponent { } ///: END:ONLY_INCLUDE_IN + renderKeyringSnapsToggle() { + let toggle = null; + ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps) + toggle = this.keyringSnapsToggle(); + ///: END:ONLY_INCLUDE_IN + + ///: BEGIN:ONLY_INCLUDE_IN(build-main) + if (!showSnapAccountExperimentalToggle()) { + toggle = null; + } + ///: END:ONLY_INCLUDE_IN + + return toggle; + } + render() { return (
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.test.js b/ui/pages/settings/experimental-tab/experimental-tab.test.js index 0c35d035d279..c384e49aeceb 100644 --- a/ui/pages/settings/experimental-tab/experimental-tab.test.js +++ b/ui/pages/settings/experimental-tab/experimental-tab.test.js @@ -20,6 +20,16 @@ const render = (overrideMetaMaskState, props = {}) => { }; describe('ExperimentalTab', () => { + beforeEach(() => { + process.env = Object.assign(process.env, { + KEYRING_SNAPS_AVAILABILITY_DATE: '02 Nov 2023 15:00:00 GMT', + }); + }); + + afterEach(() => { + delete process.env.KEYRING_SNAPS_AVAILABILITY_DATE; + }); + it('renders ExperimentalTab component without error', () => { expect(() => { render(); @@ -28,6 +38,7 @@ describe('ExperimentalTab', () => { describe('with desktop enabled', () => { it('renders ExperimentalTab component without error', () => { + jest.useFakeTimers().setSystemTime(new Date(Date.UTC(2023, 10, 3, 5))); const { container } = render({ desktopEnabled: true }); expect(container).toMatchSnapshot(); }); @@ -36,6 +47,7 @@ describe('ExperimentalTab', () => { it('should render multiple toggle options', () => { const { getAllByRole } = render({ desktopEnabled: true }); const toggle = getAllByRole('checkbox'); + expect(toggle).toHaveLength(3); }); From 8646a76227d24ed8742ef5b076c172c4ba944c39 Mon Sep 17 00:00:00 2001 From: George Marshall Date: Fri, 13 Oct 2023 01:46:57 -0700 Subject: [PATCH 123/219] Picker network updates (#21301) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** In the [new designs for Amon Hen](https://github.com/MetaMask/metamask-extension/pull/21220/files#diff-afc7617dc1347d665d4f7a058e9ea8ac686f5ad520874a293f6e27e7c50f9568) the network picker(`PickerNetwork`) has been moved to inside of the tabs and needs to be full width. The current `PickerNetwork` requires some style updates to allow for this change This PR updates the `PickerNetwork` component styles and props to allow for this updated design. It uses the pattern of inversion of control to allow for the label wrapper component to be accessed through a prop called `labelProps`. It also updates the unit tests to include coverage for this change as well as updates the documentation and stories to provide examples. ## **Manual testing steps** 1. Go to the storybook build of this PR 2. Search `PickerNetwork` 3. See that there are no visual regressions 4. Check the updated documentation and Width story ## **Screenshots/Recordings** ### **Before** https://github.com/MetaMask/metamask-extension/assets/8112138/7ca4f2ea-63fb-4e12-a3ab-34e8890bbbfc ### **After** https://github.com/MetaMask/metamask-extension/assets/8112138/22036bca-7ebd-418d-8fae-c15f055bab0c Other instances of `PickerNetwork` without visual regressions Screenshot 2023-10-10 at 10 29 55 PMScreenshot 2023-10-10 at 7 54 53 PM Showing new-network-info modal with some deprecated components replaced and flex box added Screenshot 2023-10-11 at 3 12 43 PM Screenshot 2023-10-10 at 9 53 33 PM Screenshot 2023-10-10 at 10 29 24 PM Test coverage 100% Screenshot 2023-10-10 at 6 41 48 PM ## **Related issues** https://github.com/MetaMask/metamask-extension/pull/21220/files#diff-afc7617dc1347d665d4f7a058e9ea8ac686f5ad520874a293f6e27e7c50f9568 ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [x] I’ve included tests if applicable. - [x] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- test/e2e/tests/add-custom-network.spec.js | 2 +- test/e2e/tests/custom-rpc-history.spec.js | 2 +- test/e2e/tests/switch-custom-network.spec.js | 2 +- .../picker-network/README.mdx | 31 ++++++++++++++--- .../picker-network.test.tsx.snap | 6 ++-- .../picker-network/picker-network.scss | 1 - .../picker-network/picker-network.stories.tsx | 33 +++++++++++++++---- .../picker-network/picker-network.test.tsx | 13 ++++++++ .../picker-network/picker-network.tsx | 4 ++- .../picker-network/picker-network.types.ts | 5 +++ .../__snapshots__/app-header.test.js.snap | 6 ++-- .../ui/new-network-info/new-network-info.js | 10 ++++-- .../new-network-info.stories.js | 10 ++++++ 13 files changed, 99 insertions(+), 26 deletions(-) create mode 100644 ui/components/ui/new-network-info/new-network-info.stories.js diff --git a/test/e2e/tests/add-custom-network.spec.js b/test/e2e/tests/add-custom-network.spec.js index 82233d09b34b..c4c3c3c1a31c 100644 --- a/test/e2e/tests/add-custom-network.spec.js +++ b/test/e2e/tests/add-custom-network.spec.js @@ -458,7 +458,7 @@ describe('Custom network', function () { }); // verify network switched const networkDisplayed = await driver.findElement({ - tag: 'p', + tag: 'span', text: 'Arbitrum One', }); assert.equal( diff --git a/test/e2e/tests/custom-rpc-history.spec.js b/test/e2e/tests/custom-rpc-history.spec.js index 46bde39df39e..93709a98817b 100644 --- a/test/e2e/tests/custom-rpc-history.spec.js +++ b/test/e2e/tests/custom-rpc-history.spec.js @@ -70,7 +70,7 @@ describe('Stores custom RPC history', function () { '.networks-tab__add-network-form-footer .btn-primary', ); - await driver.findElement({ text: networkName, tag: 'p' }); + await driver.findElement({ text: networkName, tag: 'span' }); }, ); }); diff --git a/test/e2e/tests/switch-custom-network.spec.js b/test/e2e/tests/switch-custom-network.spec.js index 67c3ad1fc5d8..ca40232d13a4 100644 --- a/test/e2e/tests/switch-custom-network.spec.js +++ b/test/e2e/tests/switch-custom-network.spec.js @@ -88,7 +88,7 @@ describe('Switch ethereum chain', function () { await driver.switchToWindow(extension); const currentNetworkName = await driver.findElement({ - tag: 'p', + tag: 'span', text: 'Localhost 8546', }); diff --git a/ui/components/component-library/picker-network/README.mdx b/ui/components/component-library/picker-network/README.mdx index 2e31576f8f8b..74481d251a95 100644 --- a/ui/components/component-library/picker-network/README.mdx +++ b/ui/components/component-library/picker-network/README.mdx @@ -16,7 +16,7 @@ The `PickerNetwork` is used for the action of changing a network. ### Label -Use the `label` prop for the text content of the `PickerNetwork` component. For long labels set a `max-width` using a `className` and the text will truncate showing an ellipsis. +Use the `label` prop for the text content of the `PickerNetwork` component. For long labels set a `max-width` using a `className` and the text will truncate showing an ellipsis. If the `src` prop is not set, the `label` prop will be used to generate fallback initial for `AvatarNetwork`. @@ -24,6 +24,7 @@ Use the `label` prop for the text content of the `PickerNetwork` component. For ```jsx import { PickerNetwork } from '../../ui/component-library'; + @@ -32,7 +33,7 @@ import { PickerNetwork } from '../../ui/component-library'; ### Src -Use the `src` prop with an image url to render the `AvatarNetwork`. Use the `avatarNetworkProps` to pass additional props to the `AvatarNetwork` component. +Use the `src` prop with an image url to render the `AvatarNetwork`. Use the `avatarNetworkProps` to pass additional props to the `AvatarNetwork` component. If the `src` prop is not set, the `label` prop will be used to generate fallback initial for `AvatarNetwork`. @@ -40,7 +41,27 @@ Use the `src` prop with an image url to render the `AvatarNetwork`. Use the `ava ```jsx import { PickerNetwork } from '../../ui/component-library'; - - - + + + +``` + +### Width + +The width of the `PickerNetwork` is set to auto by default. Use the style utility `width` prop with the `BlockSize` enum to set the width of the `PickerNetwork` component. + + + + + +```jsx +import { PickerNetwork } from '../../ui/component-library'; +import { BlockSize } from '../../../helpers/constants/design-system'; + +; +; ``` diff --git a/ui/components/component-library/picker-network/__snapshots__/picker-network.test.tsx.snap b/ui/components/component-library/picker-network/__snapshots__/picker-network.test.tsx.snap index 2b2226998a18..0827e30f349a 100644 --- a/ui/components/component-library/picker-network/__snapshots__/picker-network.test.tsx.snap +++ b/ui/components/component-library/picker-network/__snapshots__/picker-network.test.tsx.snap @@ -11,13 +11,13 @@ exports[`PickerNetwork should render the label inside the PickerNetwork 1`] = ` > I
-

Imported -

+ diff --git a/ui/components/component-library/picker-network/picker-network.scss b/ui/components/component-library/picker-network/picker-network.scss index 1e2e58cf083e..72fba5d389d6 100644 --- a/ui/components/component-library/picker-network/picker-network.scss +++ b/ui/components/component-library/picker-network/picker-network.scss @@ -1,7 +1,6 @@ .mm-picker-network { --picker-network-height: 32px; - max-width: fit-content; height: var(--picker-network-height); &:active { diff --git a/ui/components/component-library/picker-network/picker-network.stories.tsx b/ui/components/component-library/picker-network/picker-network.stories.tsx index be2629223525..91536945bc1c 100644 --- a/ui/components/component-library/picker-network/picker-network.stories.tsx +++ b/ui/components/component-library/picker-network/picker-network.stories.tsx @@ -3,6 +3,7 @@ import { StoryFn, Meta } from '@storybook/react'; import { Display, FlexDirection, + BlockSize, } from '../../../helpers/constants/design-system'; import { Box } from '..'; @@ -31,15 +32,24 @@ export default { }, } as Meta; -export const DefaultStory = (args) => ; +const Template = (args) => ; + +export const DefaultStory = Template.bind({}); +DefaultStory.storyName = 'Default'; export const Label: StoryFn = (args) => ( - - - - + + + + + @@ -47,7 +57,11 @@ export const Label: StoryFn = (args) => ( ); export const Src: StoryFn = (args) => ( - + = (args) => ( ); -DefaultStory.storyName = 'Default'; +export const Width: StoryFn = (args) => ( + <> + + + +); diff --git a/ui/components/component-library/picker-network/picker-network.test.tsx b/ui/components/component-library/picker-network/picker-network.test.tsx index f0a5da9d4d2c..a942276c4ab0 100644 --- a/ui/components/component-library/picker-network/picker-network.test.tsx +++ b/ui/components/component-library/picker-network/picker-network.test.tsx @@ -65,4 +65,17 @@ describe('PickerNetwork', () => { ); expect(getByTestId('picker-network')).toHaveClass('test-class'); }); + it('should render with labelProps', () => { + const { getByTestId } = render( + , + ); + expect(getByTestId('picker-network-label')).toHaveClass('test-class'); + }); }); diff --git a/ui/components/component-library/picker-network/picker-network.tsx b/ui/components/component-library/picker-network/picker-network.tsx index 282269b00b8d..fd2a2a78b8bc 100644 --- a/ui/components/component-library/picker-network/picker-network.tsx +++ b/ui/components/component-library/picker-network/picker-network.tsx @@ -30,6 +30,7 @@ export const PickerNetwork: PickerNetworkComponent = React.forwardRef( avatarNetworkProps, iconProps, label, + labelProps, src, ...props }: PickerNetworkProps, @@ -56,7 +57,7 @@ export const PickerNetwork: PickerNetworkComponent = React.forwardRef( size={AvatarNetworkSize.Xs} {...avatarNetworkProps} /> - + {label} diff --git a/ui/components/component-library/picker-network/picker-network.types.ts b/ui/components/component-library/picker-network/picker-network.types.ts index 48d97be43c9d..4946f38ad4f4 100644 --- a/ui/components/component-library/picker-network/picker-network.types.ts +++ b/ui/components/component-library/picker-network/picker-network.types.ts @@ -4,6 +4,7 @@ import type { } from '../box'; import { IconProps } from '../icon/icon.types'; import { AvatarNetworkProps } from '../avatar-network/avatar-network.types'; +import { TextProps } from '../text'; export interface PickerNetworkStyleUtilityProps extends StyleUtilityProps { /** @@ -26,6 +27,10 @@ export interface PickerNetworkStyleUtilityProps extends StyleUtilityProps { * The text content of the PickerNetwork component */ label: string; + /** + * Additional props to pass to the label wrapper Text component + */ + labelProps?: TextProps<'span'>; } export type PickerNetworkProps = diff --git a/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap b/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap index 67d265f76e1e..f27c1db843a3 100644 --- a/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap +++ b/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap @@ -216,13 +216,13 @@ exports[`App Header should match snapshot 1`] = ` > C
-

Chain 5 -

+ diff --git a/ui/components/ui/new-network-info/new-network-info.js b/ui/components/ui/new-network-info/new-network-info.js index fac443c44c00..ab58bbced971 100644 --- a/ui/components/ui/new-network-info/new-network-info.js +++ b/ui/components/ui/new-network-info/new-network-info.js @@ -9,6 +9,7 @@ import { AlignItems, Color, Display, + FlexDirection, FontWeight, TextAlign, TextVariant, @@ -16,8 +17,7 @@ import { import { IMPORT_TOKEN_ROUTE } from '../../../helpers/constants/routes'; import { getCurrentNetwork, getUseTokenDetection } from '../../../selectors'; import { setFirstTimeUsedNetwork } from '../../../store/actions'; -import { PickerNetwork, Text } from '../../component-library'; -import Box from '../box'; +import { PickerNetwork, Text, Box } from '../../component-library'; import Button from '../button'; import Popover from '../popover'; @@ -78,7 +78,11 @@ export default function NewNetworkInfo() { } > - + ; + +DefaultStory.storyName = 'Default'; From 69316d21144024b4e20d52524967e99d8692f3e2 Mon Sep 17 00:00:00 2001 From: Monte Lai Date: Fri, 13 Oct 2023 19:35:39 +0800 Subject: [PATCH 124/219] Add `data-testid` for toggle button (#21337) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This PR adds the prop `dataTestId` to the `ToggleButton` for easier testing. ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [x] I’ve included tests if applicable. - [x] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [x] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [x] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --------- Co-authored-by: Gauthier Petetin Co-authored-by: Brad Decker Co-authored-by: Marina Boboc <120041701+benjisclowder@users.noreply.github.com> Co-authored-by: Peter <53189696+PeterYinusa@users.noreply.github.com> Co-authored-by: Daniel Rocha <68558152+danroc@users.noreply.github.com> Co-authored-by: Howard Braham Co-authored-by: António Regadas Co-authored-by: Gustavo Antunes <17601467+gantunesr@users.noreply.github.com> --- .../toggle-button/toggle-button.component.js | 17 ++++- .../experimental-tab.test.js.snap | 64 +++++++++---------- .../experimental-tab.component.js | 29 ++++----- .../experimental-tab/experimental-tab.test.js | 19 +++++- 4 files changed, 78 insertions(+), 51 deletions(-) diff --git a/ui/components/ui/toggle-button/toggle-button.component.js b/ui/components/ui/toggle-button/toggle-button.component.js index c14cdbcef2c5..b6966ada856f 100644 --- a/ui/components/ui/toggle-button/toggle-button.component.js +++ b/ui/components/ui/toggle-button/toggle-button.component.js @@ -47,7 +47,15 @@ const colors = { }; const ToggleButton = (props) => { - const { value, onToggle, offLabel, onLabel, disabled, className } = props; + const { + value, + onToggle, + offLabel, + onLabel, + disabled, + className, + dataTestId, + } = props; const modifier = value ? 'on' : 'off'; @@ -77,6 +85,9 @@ const ToggleButton = (props) => { thumbStyle={thumbStyle} thumbAnimateRange={[3, 18]} colors={colors} + passThroughInputProps={{ + 'data-testId': dataTestId, + }} />
{offLabel} @@ -111,6 +122,10 @@ ToggleButton.propTypes = { * Additional className to add to the ToggleButton */ className: PropTypes.string, + /** + * A test id for the toggle button + */ + dataTestId: PropTypes.string, }; export default ToggleButton; diff --git a/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap b/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap index 4c5b019af7bd..e357dc7cad5e 100644 --- a/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap +++ b/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap @@ -208,52 +208,48 @@ exports[`ExperimentalTab with desktop enabled renders ExperimentalTab component > Enable "Add account Snap (Beta)" -
-
{ expect(setTransactionSecurityCheckEnabled).toHaveBeenCalledWith(true); expect(setSecurityAlertsEnabled).toHaveBeenCalledWith(false); }); + + it('should enable add account snap', async () => { + const setAddSnapAccountEnabled = jest.fn(); + const { getByTestId } = render( + { desktopEnabled: true }, + { + setAddSnapAccountEnabled, + }, + ); + + const toggle = getByTestId('add-snap-account-toggle'); + fireEvent.click(toggle); + + await waitFor(() => { + expect(setAddSnapAccountEnabled).toHaveBeenCalledWith(true); + }); + }); }); From 8235fa208cb563d42e6b24e96f0288f8200eb16e Mon Sep 17 00:00:00 2001 From: David Walsh Date: Fri, 13 Oct 2023 07:58:19 -0500 Subject: [PATCH 125/219] UX: Multichain: Use contants for AssetListConversionButton variants (#21333) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** Since we're expecting one of three strings for the variant of `AssetListConversionButton`, we should make those keys a constant to be imported and used. ## **Manual testing steps** No functional change. ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've clearly explained: - [ ] What problem this PR is solving. - [ ] How this problem was solved. - [ ] How reviewers can test my changes. - [ ] I’ve indicated what issue this PR is linked to: Fixes #??? - [ ] I’ve included tests if applicable. - [ ] I’ve documented any added code. - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- ui/components/app/asset-list/asset-list.js | 5 +++-- ui/components/app/nfts-tab/nfts-tab.js | 3 ++- .../asset-list-conversion-button.js | 16 ++++++++++++---- .../asset-list-conversion-button.stories.js | 7 +++++-- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/ui/components/app/asset-list/asset-list.js b/ui/components/app/asset-list/asset-list.js index 7ce813f4ce6b..11fc1e961df7 100644 --- a/ui/components/app/asset-list/asset-list.js +++ b/ui/components/app/asset-list/asset-list.js @@ -38,6 +38,7 @@ import { Display } from '../../../helpers/constants/design-system'; import { ReceiveModal } from '../../multichain/receive-modal'; import { useAccountTotalFiatBalance } from '../../../hooks/useAccountTotalFiatBalance'; +import { ASSET_LIST_CONVERSION_BUTTON_VARIANT_TYPES } from '../../multichain/asset-list-conversion-button/asset-list-conversion-button'; const AssetList = ({ onClickAsset }) => { const [showDetectedTokens, setShowDetectedTokens] = useState(false); @@ -115,7 +116,7 @@ const AssetList = ({ onClickAsset }) => { > {shouldShowBuy ? ( { openBuyCryptoInPdapp(); trackEvent({ @@ -133,7 +134,7 @@ const AssetList = ({ onClickAsset }) => { ) : null} {shouldShowReceive ? ( setShowReceiveModal(true)} /> ) : null} diff --git a/ui/components/app/nfts-tab/nfts-tab.js b/ui/components/app/nfts-tab/nfts-tab.js index 80adfc62a8be..66a8c1056b54 100644 --- a/ui/components/app/nfts-tab/nfts-tab.js +++ b/ui/components/app/nfts-tab/nfts-tab.js @@ -25,6 +25,7 @@ import { Box, ButtonLink, IconName, Text } from '../../component-library'; import NFTsDetectionNoticeNFTsTab from '../nfts-detection-notice-nfts-tab/nfts-detection-notice-nfts-tab'; import NftsItems from '../nfts-items'; import { AssetListConversionButton } from '../../multichain'; +import { ASSET_LIST_CONVERSION_BUTTON_VARIANT_TYPES } from '../../multichain/asset-list-conversion-button/asset-list-conversion-button'; export default function NftsTab() { const useNftDetection = useSelector(getUseNftDetection); @@ -76,7 +77,7 @@ export default function NftsTab() { paddingTop={4} > global.platform.openTab({ url: ZENDESK_URLS.NFT_TOKENS }) } diff --git a/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.js b/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.js index 8869daafe2ae..349bce53c44e 100644 --- a/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.js +++ b/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.js @@ -10,20 +10,26 @@ import { import { useI18nContext } from '../../../hooks/useI18nContext'; +export const ASSET_LIST_CONVERSION_BUTTON_VARIANT_TYPES = { + BUY: 'buy', + RECEIVE: 'receive', + NFT: 'nft', +}; + const ASSET_LIST_CONVERSION_BUTTON_VARIANTS = { - buy: { + [ASSET_LIST_CONVERSION_BUTTON_VARIANT_TYPES.BUY]: { color: 'var(--color-info-default)', backgroundImage: 'url(/images/token-list-buy-background.png)', text: 'buy', icon: IconName.Add, }, - receive: { + [ASSET_LIST_CONVERSION_BUTTON_VARIANT_TYPES.RECEIVE]: { color: 'var(--color-flask-default)', backgroundImage: 'url(/images/token-list-receive-background.png)', text: 'receive', icon: IconName.Arrow2Down, }, - nft: { + [ASSET_LIST_CONVERSION_BUTTON_VARIANT_TYPES.NFT]: { color: 'var(--color-error-alternative)', backgroundImage: 'url(/images/token-list-nfts-background.png)', text: 'nftLearnMore', @@ -78,5 +84,7 @@ AssetListConversionButton.propTypes = { /** * Text within the button body */ - variant: PropTypes.oneOf(['buy', 'receive', 'nft']), + variant: PropTypes.oneOf( + Object.values(ASSET_LIST_CONVERSION_BUTTON_VARIANT_TYPES), + ), }; diff --git a/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.stories.js b/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.stories.js index 4bf7248073ba..b505b01ccfb4 100644 --- a/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.stories.js +++ b/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.stories.js @@ -1,4 +1,5 @@ import React from 'react'; +import { ASSET_LIST_CONVERSION_BUTTON_VARIANT_TYPES } from './asset-list-conversion-button'; import { AssetListConversionButton } from '.'; export default { @@ -12,7 +13,6 @@ export default { args: { variant: 'buy', onClick: () => undefined, - onClose: () => undefined, }, }; @@ -20,6 +20,9 @@ export const DefaultStory = (args) => ; DefaultStory.storyName = 'Default'; export const ReceiveStory = (args) => ( - + ); ReceiveStory.storyName = 'Receive'; From b0c0c353345dd2c9ce2a661ffb2be2afb7355454 Mon Sep 17 00:00:00 2001 From: George Marshall Date: Fri, 13 Oct 2023 06:49:46 -0700 Subject: [PATCH 126/219] Fixing truncation and alignment in the network toggle component (#21370) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** Currently there is some truncation issues with long network names in the privacy incoming transactions section. The truncation of the text is not working which results in broken UI for longer network names This PR adds some styles which resolve the issue as well as adding a story for the network-toggle component for easier revision and review ## **Manual testing steps** _1. Open the storybook build on this PR _2. Search `NetworkToggle` and check the story in small screen sizes _3. Pull this branch _4. Go to Settings > Security & privacy > Incoming transactions section ## **Screenshots/Recordings** ### **Before** https://github.com/MetaMask/metamask-extension/assets/8112138/9a7028ca-f70a-4833-94db-75e81b791206 ### **After** https://github.com/MetaMask/metamask-extension/assets/8112138/770cb8c7-f8ba-4a40-b941-1115bcbdd83c ## **Related issues** _Fixes #21369_ ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [x] I’ve indicated what issue this PR is linked to: Fixes #21369 - [x] I’ve included tests if applicable. - [x] I’ve documented any added code. - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). - [x] I’ve properly set the pull request status: - [x] In case it's not yet "ready for review", I've set it to "draft". - [x] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- ui/components/app/app-components.scss | 1 + .../incoming-transaction-toggle.test.js.snap | 492 +++++++++--------- .../network-toggle.scss | 5 + .../network-toggle.stories.tsx | 33 ++ .../network-toggle.tsx | 61 ++- .../__snapshots__/security-tab.test.js.snap | 410 ++++++++------- 6 files changed, 549 insertions(+), 453 deletions(-) create mode 100644 ui/components/app/incoming-trasaction-toggle/network-toggle.scss create mode 100644 ui/components/app/incoming-trasaction-toggle/network-toggle.stories.tsx diff --git a/ui/components/app/app-components.scss b/ui/components/app/app-components.scss index 24bfd9146013..476901a28f62 100644 --- a/ui/components/app/app-components.scss +++ b/ui/components/app/app-components.scss @@ -49,6 +49,7 @@ @import 'multilayer-fee-message/index'; @import 'multiple-notifications/index'; @import 'network-display/index'; +@import 'ui/components/app/incoming-trasaction-toggle/network-toggle'; @import 'permission-page-container/index'; @import 'permissions-connect-footer/index'; @import 'permissions-connect-header/index'; diff --git a/ui/components/app/incoming-trasaction-toggle/__snapshots__/incoming-transaction-toggle.test.js.snap b/ui/components/app/incoming-trasaction-toggle/__snapshots__/incoming-transaction-toggle.test.js.snap index 0113330cccdd..465ba53bbb89 100644 --- a/ui/components/app/incoming-trasaction-toggle/__snapshots__/incoming-transaction-toggle.test.js.snap +++ b/ui/components/app/incoming-trasaction-toggle/__snapshots__/incoming-transaction-toggle.test.js.snap @@ -16,11 +16,11 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p This relies on different third-party APIs for each network, which expose your Ethereum address and your IP address.

Ethereum Mainnet

-
+ style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);" + > +
+
+
+
+
+
-
+ + Off + + + On +
- -
-
- - Off - - - On - -
- + +

Linea Mainnet

-
+ style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);" + > +
+
+
+
+
+
-
+ + Off + + + On +
- -
-
- - Off - - - On - -
- + +

FANTOM

-
+ style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);" + > +
+
+
+
+
+
-
+ + Off + + + On +
- -
-
- - Off - - - On - -
- + +

Goerli

-
+ style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);" + > +
+
+
+
+
+
-
+ + Off + + + On +
- -
-
- - Off - - - On - -
- + +

Sepolia

-
+ style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);" + > +
+
+
+
+
+
-
+ + Off + + + On +
- -
-
- - Off - - - On - -
- + +

Linea Goerli

-

Custom Mainnet RPC

-
+ style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);" + > +
+
+
+
+
+
-
+ + Off + + + On +
- -
-
- - Off - - - On - -
- + +

Linea Mainnet

-
+ style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);" + > +
+
+
+
+
+
-
+ + Off + + + On +
- -
-
- - Off - - - On - -
- + +

Goerli

-
+ style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);" + > +
+
+
+
+
+
-
+ + Off + + + On +
- -
-
- - Off - - - On - -
- + +

Sepolia

-
+ style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);" + > +
+
+
+
+
+
-
+ + Off + + + On +
- -
-
- - Off - - - On - -
- + +

Linea Goerli

-