From 006242f09677a7a034a8caa0e320d75ad6af3864 Mon Sep 17 00:00:00 2001
From: MetaMask Bot <metamaskbot@users.noreply.github.com>
Date: Thu, 9 Feb 2023 20:41:43 +0000
Subject: [PATCH 01/36] Version v10.26.0

---
 CHANGELOG.md | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 package.json |   2 +-
 2 files changed, 175 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ec228737..929827745 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,178 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [10.26.0]
+### Uncategorized
+- Sync `master` with `develop` ([#17665](https://github.com/MetaMask/metamask-extension/pull/17665))
+- Deprecating Typography component ([#17672](https://github.com/MetaMask/metamask-extension/pull/17672))
+- remove siwe feature flag ([#17690](https://github.com/MetaMask/metamask-extension/pull/17690))
+- Fix recent recipient order ([#16346](https://github.com/MetaMask/metamask-extension/pull/16346))
+- Add testing documentation ([#17411](https://github.com/MetaMask/metamask-extension/pull/17411))
+- Merge branch 'develop' into master-sync
+- Fix for error during sending to multisig address ([#17651](https://github.com/MetaMask/metamask-extension/pull/17651))
+- UX: Update block explorer icon ([#17562](https://github.com/MetaMask/metamask-extension/pull/17562))
+- Merge branch 'develop' into master-sync
+- fix test of useTransactionDisplayData for different timezone ([#17063](https://github.com/MetaMask/metamask-extension/pull/17063))
+- Sanitising string on signature request pages ([#17571](https://github.com/MetaMask/metamask-extension/pull/17571))
+- Conflict cleanup 10.25.0 master-sync
+- Merge remote-tracking branch 'origin/develop' into master-sync
+- Expand network controller unit test coverage ([#17498](https://github.com/MetaMask/metamask-extension/pull/17498))
+- Detect and track UI customizations on Personal Sign Requests ([#16222](https://github.com/MetaMask/metamask-extension/pull/16222))
+- Sign-in with Ethereum Domain Binding ([#16616](https://github.com/MetaMask/metamask-extension/pull/16616))
+- Update `json-rpc-middleware-stream` from v2 to v4 ([#17588](https://github.com/MetaMask/metamask-extension/pull/17588))
+- converted collectibles files to nfts ([#17658](https://github.com/MetaMask/metamask-extension/pull/17658))
+- E2e test insights ([#17535](https://github.com/MetaMask/metamask-extension/pull/17535))
+- [TS dashboard] Reorganize files slightly ([#17335](https://github.com/MetaMask/metamask-extension/pull/17335))
+- add brad-decker as codeowner of .circle/ folder ([#17648](https://github.com/MetaMask/metamask-extension/pull/17648))
+- Sort permissions based on weight ([#17660](https://github.com/MetaMask/metamask-extension/pull/17660))
+- Refactor ConfirmTransaction to Functional Component ([#17473](https://github.com/MetaMask/metamask-extension/pull/17473))
+- Add desktop build type ([#17592](https://github.com/MetaMask/metamask-extension/pull/17592))
+- add double arrow icons ([#17654](https://github.com/MetaMask/metamask-extension/pull/17654))
+- Add e2e test: send nft  ([#17638](https://github.com/MetaMask/metamask-extension/pull/17638))
+- Adding docs for layout and spacing for Icon component ([#17612](https://github.com/MetaMask/metamask-extension/pull/17612))
+- Collectible Unit Tests ([#17632](https://github.com/MetaMask/metamask-extension/pull/17632))
+- Update BannerAlert component ([#17586](https://github.com/MetaMask/metamask-extension/pull/17586))
+- fix: update ledger logo ([#17616](https://github.com/MetaMask/metamask-extension/pull/17616))
+- Add hardcoded list of human-readable snap derivation paths ([#17627](https://github.com/MetaMask/metamask-extension/pull/17627))
+- [FLASK] Create E2E test for RPC endowment ([#17525](https://github.com/MetaMask/metamask-extension/pull/17525))
+- Added metric Phishing Page Displayed for phishing warning page ([#17462](https://github.com/MetaMask/metamask-extension/pull/17462))
+- updated assets and phishing controller packages ([#17569](https://github.com/MetaMask/metamask-extension/pull/17569))
+- UX: Fix token image not displaying in asset listing ([#17575](https://github.com/MetaMask/metamask-extension/pull/17575))
+- Prevent lint warning in ActionableMessage ([#17598](https://github.com/MetaMask/metamask-extension/pull/17598))
+- [doc] add Jest debugging guide (docs/tests/jest.md) ([#17594](https://github.com/MetaMask/metamask-extension/pull/17594))
+- Add hardcoded list of human-readable snap names ([#17595](https://github.com/MetaMask/metamask-extension/pull/17595))
+- NFTs: Update event name for Detect NFT settings ([#17597](https://github.com/MetaMask/metamask-extension/pull/17597))
+- Change COLORS reference to Color ([#17599](https://github.com/MetaMask/metamask-extension/pull/17599))
+- UX: Remove the IconCopy and IconCopied Components and their usages ([#17530](https://github.com/MetaMask/metamask-extension/pull/17530))
+- UX: Update support icon ([#17560](https://github.com/MetaMask/metamask-extension/pull/17560))
+- Convert actions.js to typescript ([#17446](https://github.com/MetaMask/metamask-extension/pull/17446))
+- Disable fiat conversion in Approve Screen when `Show balance and token price checker` is OFF ([#17443](https://github.com/MetaMask/metamask-extension/pull/17443))
+- Ensure the advanced gas modal displays a zero priority fee if that is how it is set in the transaction ([#17559](https://github.com/MetaMask/metamask-extension/pull/17559))
+- feature: convert ui/ducks/app/app.ts to typescript ([#17454](https://github.com/MetaMask/metamask-extension/pull/17454))
+- Fix speed up of 0 max priority fee transactions ([#17547](https://github.com/MetaMask/metamask-extension/pull/17547))
+- update banner base component ([#17582](https://github.com/MetaMask/metamask-extension/pull/17582))
+- updated tag icon ([#17540](https://github.com/MetaMask/metamask-extension/pull/17540))
+- decrease coverage threshold that requires bump ([#17544](https://github.com/MetaMask/metamask-extension/pull/17544))
+- Dead and redundant code removal ([#17512](https://github.com/MetaMask/metamask-extension/pull/17512))
+- initialize currentLocale in the locale slice upon app start ([#17579](https://github.com/MetaMask/metamask-extension/pull/17579))
+- fix: fix non-critical warning in tests ([#17567](https://github.com/MetaMask/metamask-extension/pull/17567))
+- feature: migrate design-system.ts ([#17518](https://github.com/MetaMask/metamask-extension/pull/17518))
+- Convert store.js to typescript and redux toolkit ([#17508](https://github.com/MetaMask/metamask-extension/pull/17508))
+- Add error module for safely handling errors ([#17511](https://github.com/MetaMask/metamask-extension/pull/17511))
+- Convert action-queue to TypeScript ([#17509](https://github.com/MetaMask/metamask-extension/pull/17509))
+- Add network client tests for methods not supported by Infura ([#17347](https://github.com/MetaMask/metamask-extension/pull/17347))
+- Add e2e test:  import nft ([#17543](https://github.com/MetaMask/metamask-extension/pull/17543))
+- Adding browser outdated notification ([#17027](https://github.com/MetaMask/metamask-extension/pull/17027))
+- Convert confirm-tx.utils.js to typescript ([#17349](https://github.com/MetaMask/metamask-extension/pull/17349))
+- updated CollectibleDetail Storybook Coverage ([#17351](https://github.com/MetaMask/metamask-extension/pull/17351))
+- adding textfix on experimental tab ([#17306](https://github.com/MetaMask/metamask-extension/pull/17306))
+- Allow background to handle forgotten password flow ([#17501](https://github.com/MetaMask/metamask-extension/pull/17501))
+- GasDisplay: fix z-index for Confirm Approve warning ([#17470](https://github.com/MetaMask/metamask-extension/pull/17470))
+- Fix http-cache-semantics dependency vulnerability GHSA-rc47-6667-2j5j ([#17563](https://github.com/MetaMask/metamask-extension/pull/17563))
+- Detailed document for refactoring signature request pages in extension ([#17456](https://github.com/MetaMask/metamask-extension/pull/17456))
+- Move confirm-transaction/conf-tx.js to confirm-signature-request ([#17408](https://github.com/MetaMask/metamask-extension/pull/17408))
+- remove nft toaster on first autohide ([#17536](https://github.com/MetaMask/metamask-extension/pull/17536))
+- Convert ui/store/actionConstants.js -> Typescript ([#17442](https://github.com/MetaMask/metamask-extension/pull/17442))
+- Fixing yarn version command, adding yarn version plugin ([#17325](https://github.com/MetaMask/metamask-extension/pull/17325))
+- 🐛 Calldata validation ([#17326](https://github.com/MetaMask/metamask-extension/pull/17326))
+- remove unused banner base proptype ([#17531](https://github.com/MetaMask/metamask-extension/pull/17531))
+- Add tests for `retryOnEmpty` middleware ([#17364](https://github.com/MetaMask/metamask-extension/pull/17364))
+- prefer locale slice for locale state ([#17499](https://github.com/MetaMask/metamask-extension/pull/17499))
+- Fixing/extending type definitions for later usage ([#17514](https://github.com/MetaMask/metamask-extension/pull/17514))
+- TypeScript tooling fixes ([#17513](https://github.com/MetaMask/metamask-extension/pull/17513))
+- Onboarding V2: Remove old onboarding flow ([#17081](https://github.com/MetaMask/metamask-extension/pull/17081))
+- Fix build ([#17538](https://github.com/MetaMask/metamask-extension/pull/17538))
+- fix button text props ([#17478](https://github.com/MetaMask/metamask-extension/pull/17478))
+- Refactoring confirm-transaction-base component ([#17484](https://github.com/MetaMask/metamask-extension/pull/17484))
+- Refactor conf-tx.js ([#17380](https://github.com/MetaMask/metamask-extension/pull/17380))
+- Fix RPC Url editing issue of existing network ([#17451](https://github.com/MetaMask/metamask-extension/pull/17451))
+- Adjust 'Confirm' button color on setApprovalForAll revocations ([#17506](https://github.com/MetaMask/metamask-extension/pull/17506))
+- Move THEME_TYPE to new preferences.ts file ([#17515](https://github.com/MetaMask/metamask-extension/pull/17515))
+- Fix #17328 - Move NFT settings to Experimental ([#17400](https://github.com/MetaMask/metamask-extension/pull/17400))
+- UX - Update all copy icons ([#17445](https://github.com/MetaMask/metamask-extension/pull/17445))
+- Added navigation between multiple sign prompts and reject all sign prompts ([#17093](https://github.com/MetaMask/metamask-extension/pull/17093))
+- Fix #17439 - Prevent event error when user presses enter key during onboarding ([#17497](https://github.com/MetaMask/metamask-extension/pull/17497))
+- Update overview icons for buy, send, and swap ([#17492](https://github.com/MetaMask/metamask-extension/pull/17492))
+- New Icons: Replace instance of fa-qr-code icon ([#17474](https://github.com/MetaMask/metamask-extension/pull/17474))
+- Fix #17441 - Update all MenuItem instances to use new icons ([#17468](https://github.com/MetaMask/metamask-extension/pull/17468))
+- Fix #17393 - Fix NFT collection header image ([#17394](https://github.com/MetaMask/metamask-extension/pull/17394))
+- Add e2e test: add custome network during onboarding ([#17436](https://github.com/MetaMask/metamask-extension/pull/17436))
+- feat(mme-17214): migrate L33 files to typescript ([#17372](https://github.com/MetaMask/metamask-extension/pull/17372))
+- Update copy when revoking setApprovalForAll ([#17500](https://github.com/MetaMask/metamask-extension/pull/17500))
+- master sync following v10.24.2 ([#17504](https://github.com/MetaMask/metamask-extension/pull/17504))
+- Merge remote-tracking branch 'origin/develop' into master-sync
+- Update home portfolio dapp icon to new icon ([#17471](https://github.com/MetaMask/metamask-extension/pull/17471))
+- Document `displayWarning` as deprecated ([#17465](https://github.com/MetaMask/metamask-extension/pull/17465))
+- Ignore `storybook-build` lint errors ([#17373](https://github.com/MetaMask/metamask-extension/pull/17373))
+- remove snap notifications when uninstalled ([#17487](https://github.com/MetaMask/metamask-extension/pull/17487))
+- Nft build for e2e tests ([#17430](https://github.com/MetaMask/metamask-extension/pull/17430))
+- feature: convert level 32 files to typescript ([#17390](https://github.com/MetaMask/metamask-extension/pull/17390))
+- [e2e]Add e2e test for deleting custom network ([#17254](https://github.com/MetaMask/metamask-extension/pull/17254))
+- Fix #17362 - Ensure NFT icons are correct ([#17440](https://github.com/MetaMask/metamask-extension/pull/17440))
+- Fix #17385 - Provide autohide callback for ActionMessage ([#17392](https://github.com/MetaMask/metamask-extension/pull/17392))
+- button link housekeeping ([#16885](https://github.com/MetaMask/metamask-extension/pull/16885))
+- Bump lavapack version to 5 ([#17431](https://github.com/MetaMask/metamask-extension/pull/17431))
+- feature: convert shared/modules/contract-utils.test.js to typescript ([#17435](https://github.com/MetaMask/metamask-extension/pull/17435))
+- Refactor confirm page container component from class to functional component ([#16907](https://github.com/MetaMask/metamask-extension/pull/16907))
+- Test parameter change cache miss ([#17346](https://github.com/MetaMask/metamask-extension/pull/17346))
+- Document callback-style background calls as deprecated ([#17376](https://github.com/MetaMask/metamask-extension/pull/17376))
+- [GridPlus] Bumps `gridplus-sdk` to v2.4.1 ([#16847](https://github.com/MetaMask/metamask-extension/pull/16847))
+- Put hardware wallets behind an HARDWARE_WALLETS_MV3 flag ([#17354](https://github.com/MetaMask/metamask-extension/pull/17354))
+- Consolidated all component import paths ([#17368](https://github.com/MetaMask/metamask-extension/pull/17368))
+- updated new links for the stories ([#17369](https://github.com/MetaMask/metamask-extension/pull/17369))
+- Fix #17388 - Remove dismiss button from NFT notification ([#17389](https://github.com/MetaMask/metamask-extension/pull/17389))
+- Remove a notification for falling back from STX to regular swaps ([#17374](https://github.com/MetaMask/metamask-extension/pull/17374))
+- Feat/15086/add banner severities component ([#17307](https://github.com/MetaMask/metamask-extension/pull/17307))
+- fix icon names ([#17391](https://github.com/MetaMask/metamask-extension/pull/17391))
+- Fix Playwright install step ([#17415](https://github.com/MetaMask/metamask-extension/pull/17415))
+- Fix broken NFT import and auto-detect flows ([#17384](https://github.com/MetaMask/metamask-extension/pull/17384))
+- Convert ui/helpers/constants/common to typescript ([#17348](https://github.com/MetaMask/metamask-extension/pull/17348))
+- Copy update on Transaction breakdown for ApproveToken ([#17296](https://github.com/MetaMask/metamask-extension/pull/17296))
+- Add alt text for NFT images ([#17284](https://github.com/MetaMask/metamask-extension/pull/17284))
+- Nit fixes for story-test integration ([#17344](https://github.com/MetaMask/metamask-extension/pull/17344))
+- remove duplicate comment line ([#17381](https://github.com/MetaMask/metamask-extension/pull/17381))
+- Complete level 36 migration of TypeScript by converting conversion.utils.js and deprecate old conversion util ([#17262](https://github.com/MetaMask/metamask-extension/pull/17262))
+- icon audit, remove xxs icon size ([#17089](https://github.com/MetaMask/metamask-extension/pull/17089))
+- Activate LavaMoat scuttling security feature ([#17276](https://github.com/MetaMask/metamask-extension/pull/17276))
+- feat(mme-17212): convert shared/constants/swaps.js -> Typescript ([#17322](https://github.com/MetaMask/metamask-extension/pull/17322))
+- Add Firefox Snow support ([#17147](https://github.com/MetaMask/metamask-extension/pull/17147))
+- Move subject type enum to `@metamask/subject-metadata-controller` ([#16431](https://github.com/MetaMask/metamask-extension/pull/16431))
+- Replace usages of conversion util in rest of UI folder in favor of Numeric ([#17334](https://github.com/MetaMask/metamask-extension/pull/17334))
+- Fix/use etherjs specific imports ([#15461](https://github.com/MetaMask/metamask-extension/pull/15461))
+- Fix #17300, #16843 - Use proper source for image of IPFS NFTs ([#17302](https://github.com/MetaMask/metamask-extension/pull/17302))
+- Sync `master` with `develop` ([#17359](https://github.com/MetaMask/metamask-extension/pull/17359))
+- [FLASK] `snaps-monorepo@0.28.0` ([#17277](https://github.com/MetaMask/metamask-extension/pull/17277))
+- Remove usages of Conversion util in components folder in favor of Numeric ([#17333](https://github.com/MetaMask/metamask-extension/pull/17333))
+- Refactor Errors E2E test to no longer rely upon a real error ([#17332](https://github.com/MetaMask/metamask-extension/pull/17332))
+- Merge remote-tracking branch 'origin/develop' into master-sync
+- Fix cookiejar dependency vulnerability ([#17355](https://github.com/MetaMask/metamask-extension/pull/17355))
+- [FLASK] Update onboarding text to fit new panel ([#17345](https://github.com/MetaMask/metamask-extension/pull/17345))
+- Refactor usages of conversion util in the app folder and shared folder in favor of Numeric ([#17331](https://github.com/MetaMask/metamask-extension/pull/17331))
+- Updated Icons in Title of NFTs ([#17205](https://github.com/MetaMask/metamask-extension/pull/17205))
+- Enable the Token Allowance flow by default for all users ([#16740](https://github.com/MetaMask/metamask-extension/pull/16740))
+- Convert app//scripts/lib/util.js to typescript ([#17330](https://github.com/MetaMask/metamask-extension/pull/17330))
+- Restore support for Chromium v78 ([#17251](https://github.com/MetaMask/metamask-extension/pull/17251))
+- Added fix for overlaping text in mozzila in activity tab ([#17235](https://github.com/MetaMask/metamask-extension/pull/17235))
+- Use PageContainerFooter to render footer on all confirmation pages ([#17316](https://github.com/MetaMask/metamask-extension/pull/17316))
+- chore: copy update for metamask fee on swaps ([#17133](https://github.com/MetaMask/metamask-extension/pull/17133))
+- Security provider check (OpenSea) ([#16584](https://github.com/MetaMask/metamask-extension/pull/16584))
+- Setup network controller mocks per-test ([#17250](https://github.com/MetaMask/metamask-extension/pull/17250))
+- Added toaster for removed NFTs ([#17297](https://github.com/MetaMask/metamask-extension/pull/17297))
+- Integrate `KeyringController` v10 ([#17056](https://github.com/MetaMask/metamask-extension/pull/17056))
+- add numeric module ([#17324](https://github.com/MetaMask/metamask-extension/pull/17324))
+- Convert app/scripts/constants -> Typescript ([#17327](https://github.com/MetaMask/metamask-extension/pull/17327))
+- Use async/await instead of Promise.resolve ([#16221](https://github.com/MetaMask/metamask-extension/pull/16221))
+- Added storybook check to CI ([#17092](https://github.com/MetaMask/metamask-extension/pull/17092))
+- feat(mme-17212): convert shared/module/string-utils.js -> Typescript ([#17320](https://github.com/MetaMask/metamask-extension/pull/17320))
+- Relocate conversion utils to shared/modules/conversion.utils.js ([#17319](https://github.com/MetaMask/metamask-extension/pull/17319))
+- Fix #17138 - Allow ActionMessage to be autohidden after a given number of milliseconds ([#17269](https://github.com/MetaMask/metamask-extension/pull/17269))
+- i18n: fix es privacy policy links ([#17315](https://github.com/MetaMask/metamask-extension/pull/17315))
+- fix script for linting changed files ([#17028](https://github.com/MetaMask/metamask-extension/pull/17028))
+- Convert shared/constants/hardware-wallets.js -> Typescript ([#17310](https://github.com/MetaMask/metamask-extension/pull/17310))
+- TransactionDecoding: rm unwanted cursor: pointer ([#17318](https://github.com/MetaMask/metamask-extension/pull/17318))
+- Convert shared/constants/labels.js -> Typescript ([#17309](https://github.com/MetaMask/metamask-extension/pull/17309))
+- Fix transaction decoding data types `string` and `bool` ([#17299](https://github.com/MetaMask/metamask-extension/pull/17299))
+
 ## [10.25.0]
 ### Added
 - Add new app translations ([#15999](https://github.com/MetaMask/metamask-extension/pull/15999))
@@ -3473,7 +3645,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/v10.25.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.26.0...HEAD
+[10.26.0]: https://github.com/MetaMask/metamask-extension/compare/v10.25.0...v10.26.0
 [10.25.0]: https://github.com/MetaMask/metamask-extension/compare/v10.24.2...v10.25.0
 [10.24.2]: https://github.com/MetaMask/metamask-extension/compare/v10.24.1...v10.24.2
 [10.24.1]: https://github.com/MetaMask/metamask-extension/compare/v10.24.0...v10.24.1
diff --git a/package.json b/package.json
index 29f7900bc..c20342130 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "private": true,
   "repository": {
     "type": "git",

From 72ae54bfa3415b378727c56b85156bbf077b9656 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Wed, 15 Feb 2023 10:26:21 -0600
Subject: [PATCH 02/36] UX: Icons: Use proper send icon on wallet and token
 overview pages (#17720)

---
 ui/components/app/wallet-overview/eth-overview.js   | 2 +-
 ui/components/app/wallet-overview/token-overview.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/components/app/wallet-overview/eth-overview.js b/ui/components/app/wallet-overview/eth-overview.js
index 17d03873b..e5357686f 100644
--- a/ui/components/app/wallet-overview/eth-overview.js
+++ b/ui/components/app/wallet-overview/eth-overview.js
@@ -130,7 +130,7 @@ const EthOverview = ({ className }) => {
               data-testid="eth-overview-send"
               Icon={
                 <Icon
-                  name={ICON_NAMES.SEND_1}
+                  name={ICON_NAMES.ARROW_2_RIGHT}
                   color={IconColor.primaryInverse}
                 />
               }
diff --git a/ui/components/app/wallet-overview/token-overview.js b/ui/components/app/wallet-overview/token-overview.js
index 8ff03dcbc..363a1b250 100644
--- a/ui/components/app/wallet-overview/token-overview.js
+++ b/ui/components/app/wallet-overview/token-overview.js
@@ -163,7 +163,7 @@ const TokenOverview = ({ className, token }) => {
               }}
               Icon={
                 <Icon
-                  name={ICON_NAMES.SEND_1}
+                  name={ICON_NAMES.ARROW_2_RIGHT}
                   color={IconColor.primaryInverse}
                 />
               }

From 48251a4189f71f1678d07dcf1227f8fe5b3294f7 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Fri, 10 Feb 2023 07:15:54 -0800
Subject: [PATCH 03/36] Ensure simulation failure warning is shown on all
 networks and accounts (#17458)

* Ensure simulation failure warning is shown on all networks and accounts

* Add e2e test to cover failure warning behaviour on non-eip-1559 network

* Fix new e2e test
---
 test/e2e/tests/failing-contract.spec.js       | 88 +++++++++++++++++++
 .../confirm-transaction-base.component.js     |  4 +-
 2 files changed, 89 insertions(+), 3 deletions(-)

diff --git a/test/e2e/tests/failing-contract.spec.js b/test/e2e/tests/failing-contract.spec.js
index babd46e72..d7cff9c5e 100644
--- a/test/e2e/tests/failing-contract.spec.js
+++ b/test/e2e/tests/failing-contract.spec.js
@@ -85,3 +85,91 @@ describe('Failing contract interaction ', function () {
     );
   });
 });
+
+describe('Failing contract interaction on non-EIP1559 network', function () {
+  const smartContract = SMART_CONTRACTS.FAILING;
+  const ganacheOptions = {
+    hardfork: 'berlin',
+    accounts: [
+      {
+        secretKey:
+          '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
+        balance: convertToHexValue(25000000000000000000),
+      },
+    ],
+  };
+  it('should display a warning when the contract interaction is expected to fail', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withPermissionControllerConnectedToTestDapp()
+          .build(),
+        ganacheOptions,
+        smartContract,
+        title: this.test.title,
+      },
+      async ({ driver, contractRegistry }) => {
+        const contractAddress = await contractRegistry.getContractAddress(
+          smartContract,
+        );
+        await driver.navigate();
+        await driver.fill('#password', 'correct horse battery staple');
+        await driver.press('#password', driver.Key.ENTER);
+
+        await driver.openNewPage(
+          `http://127.0.0.1:8080/?contract=${contractAddress}`,
+        );
+        let windowHandles = await driver.getAllWindowHandles();
+        const extension = windowHandles[0];
+        // waits for deployed contract and calls failing contract method
+        await driver.findClickableElement('#deployButton');
+
+        await driver.fill('#toInput', contractAddress);
+        await driver.fill('#amountInput', '0');
+        await driver.fill('#gasInput', '100');
+
+        await driver.clickElement('#submitForm');
+
+        await driver.waitUntilXWindowHandles(3);
+        windowHandles = await driver.getAllWindowHandles();
+        await driver.switchToWindowWithTitle(
+          'MetaMask Notification',
+          windowHandles,
+        );
+
+        // display warning when transaction is expected to fail
+        const warningText =
+          'We were not able to estimate gas. There might be an error in the contract and this transaction may fail.';
+        const warning = await driver.findElement(
+          '.actionable-message__message',
+        );
+        const confirmButton = await driver.findElement(
+          '[data-testid="page-container-footer-next"]',
+        );
+        assert.equal(await warning.getText(), warningText);
+        assert.equal(await confirmButton.isEnabled(), false);
+
+        // dismiss warning and confirm the transaction
+        await driver.clickElement({
+          text: 'I want to proceed anyway',
+          tag: 'button',
+        });
+        await driver.clickElement({ text: 'Confirm', tag: 'button' });
+        await driver.waitUntilXWindowHandles(2);
+        await driver.switchToWindow(extension);
+        await driver.clickElement({ text: 'Activity', tag: 'button' });
+        await driver.waitForSelector(
+          '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
+          { timeout: 10000 },
+        );
+
+        // display the transaction status
+        const transactionStatus = await driver.findElement(
+          '.transaction-list-item:nth-of-type(1) .transaction-status-label',
+        );
+        assert.equal(await transactionStatus.getText(), 'Failed');
+      },
+    );
+  });
+});
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 b9a956dd0..0f38bfc77 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
@@ -595,9 +595,7 @@ export default class ConfirmTransactionBase extends Component {
               : () => this.handleEditGas()
           }
           rows={[
-            renderSimulationFailureWarning &&
-              !this.supportsEIP1559 &&
-              simulationFailureWarning(),
+            renderSimulationFailureWarning && simulationFailureWarning(),
             !renderSimulationFailureWarning &&
               !isMultiLayerFeeNetwork &&
               renderGasDetailsItem(),

From d0aa1432227db2f6e5dc0d894da4aff1439c384a Mon Sep 17 00:00:00 2001
From: Brad Decker <bhdecker84@gmail.com>
Date: Wed, 15 Feb 2023 10:26:32 -0600
Subject: [PATCH 04/36] adds test and fix for conversion to use numeric
 (#17758)

---
 .../lib/transaction-controller-utils.test.js  | 235 +++++++++++++++++-
 shared/lib/transactions-controller-utils.js   |   6 +-
 2 files changed, 233 insertions(+), 8 deletions(-)

diff --git a/shared/lib/transaction-controller-utils.test.js b/shared/lib/transaction-controller-utils.test.js
index 3920466ea..c1e661ed7 100644
--- a/shared/lib/transaction-controller-utils.test.js
+++ b/shared/lib/transaction-controller-utils.test.js
@@ -1,8 +1,233 @@
-import { calcGasTotal } from './transactions-controller-utils';
+import { EtherDenomination } from '../constants/common';
+import { CHAIN_IDS } from '../constants/network';
+import { TransactionEnvelopeType } from '../constants/transaction';
+import { Numeric } from '../modules/Numeric';
+import {
+  calcGasTotal,
+  calcTokenAmount,
+  getSwapsTokensReceivedFromTxMeta,
+  TOKEN_TRANSFER_LOG_TOPIC_HASH,
+} from './transactions-controller-utils';
 
-describe('calcGasTotal()', () => {
-  it('should correctly compute gasTotal', () => {
-    const result = calcGasTotal(12, 15);
-    expect(result).toStrictEqual('17a');
+describe('transaction controller utils', () => {
+  describe('calcGasTotal()', () => {
+    it('should correctly compute gasTotal', () => {
+      const result = calcGasTotal(12, 15);
+      expect(result).toStrictEqual('17a');
+    });
+  });
+
+  describe('getSwapsTokensReceivedFromTxMeta', () => {
+    it('returns null if txMeta is not well formed', () => {
+      expect(getSwapsTokensReceivedFromTxMeta('ETH', {}, '0x00')).toBe(null);
+    });
+
+    it('returns null if tokenSymbol is the default for network but txMeta does not contain a receipt', () => {
+      expect(
+        getSwapsTokensReceivedFromTxMeta(
+          'ETH',
+          {},
+          '0x00',
+          '8',
+          {},
+          CHAIN_IDS.MAINNET,
+        ),
+      ).toBe(null);
+    });
+
+    it('returns null if tokenSymbol is the default for network but txMeta does not contain a preTxBalance', () => {
+      expect(
+        getSwapsTokensReceivedFromTxMeta(
+          'ETH',
+          { txReceipt: {}, postTxBalance: '0xe' },
+          '0x00',
+          '8',
+          {},
+          CHAIN_IDS.MAINNET,
+        ),
+      ).toBe(null);
+    });
+
+    it('returns null if tokenSymbol is the default for network but txMeta does not contain a postTxBalance', () => {
+      expect(
+        getSwapsTokensReceivedFromTxMeta(
+          'ETH',
+          { txReceipt: {}, preTxBalance: '0xe' },
+          '0x00',
+          '8',
+          {},
+          CHAIN_IDS.MAINNET,
+        ),
+      ).toBe(null);
+    });
+
+    it('returns estimated receiving amount if post and pre tx balances are the same', () => {
+      expect(
+        getSwapsTokensReceivedFromTxMeta(
+          'ETH',
+          {
+            txReceipt: {},
+            preTxBalance: '0xe',
+            postTxBalance: '0xe',
+            swapMetaData: { token_to_amount: '0x1' },
+          },
+          '0x00',
+          '0x00',
+          '8',
+          {},
+          CHAIN_IDS.MAINNET,
+        ),
+      ).toBe('0x1');
+    });
+
+    it('returns postTxBalance minus preTxBalance less the cost of gas of the transaction', () => {
+      const preTxBalance = new Numeric('5000000', 10, EtherDenomination.WEI);
+      const postTxBalance = new Numeric('5500000', 10, EtherDenomination.WEI);
+      const gasUsed = new Numeric('28000', 10).toPrefixedHexString();
+      const effectiveGasPrice = new Numeric('21', 10).toPrefixedHexString();
+      const gasCost = calcGasTotal(gasUsed, effectiveGasPrice);
+      const ethReceived = postTxBalance
+        .minus(preTxBalance.minus(gasCost, 16))
+        .toDenomination(EtherDenomination.ETH)
+        .round(6);
+      expect(
+        getSwapsTokensReceivedFromTxMeta(
+          'ETH',
+          {
+            txReceipt: {
+              gasUsed,
+              effectiveGasPrice,
+              type: TransactionEnvelopeType.feeMarket,
+            },
+            preTxBalance: preTxBalance.toPrefixedHexString(),
+            postTxBalance: postTxBalance.toPrefixedHexString(),
+            swapMetaData: { token_to_amount: '0x1' },
+          },
+          '0x00',
+          '0x00',
+          '8',
+          {},
+          CHAIN_IDS.MAINNET,
+        ),
+      ).toBe(ethReceived.toString());
+    });
+
+    it('returns postTxBalance minus preTxBalance less the cost of gas of the transaction and the approval tx', () => {
+      const preTxBalance = new Numeric('5000000', 10, EtherDenomination.WEI);
+      const postTxBalance = new Numeric('5500000', 10, EtherDenomination.WEI);
+      const gasUsed = new Numeric('28000', 10).toPrefixedHexString();
+      const gasUsedApproval = new Numeric('75000', 10).toPrefixedHexString();
+      const effectiveGasPrice = new Numeric('21', 10).toPrefixedHexString();
+      const effectiveGasPriceApproval = new Numeric(
+        '15',
+        10,
+      ).toPrefixedHexString();
+      const gasCost = new Numeric(
+        calcGasTotal(gasUsed, effectiveGasPrice),
+        16,
+      ).add(calcGasTotal(gasUsedApproval, effectiveGasPriceApproval), 16);
+      const ethReceived = postTxBalance
+        .minus(preTxBalance.minus(gasCost))
+        .toDenomination(EtherDenomination.ETH)
+        .round(6);
+      expect(
+        getSwapsTokensReceivedFromTxMeta(
+          'ETH',
+          {
+            txReceipt: {
+              gasUsed,
+              effectiveGasPrice,
+              type: TransactionEnvelopeType.feeMarket,
+            },
+            preTxBalance: preTxBalance.toPrefixedHexString(),
+            postTxBalance: postTxBalance.toPrefixedHexString(),
+            swapMetaData: { token_to_amount: '0x1' },
+          },
+          '0x00',
+          '0x00',
+          '8',
+          {
+            txReceipt: {
+              gasUsed: gasUsedApproval,
+              effectiveGasPrice: effectiveGasPriceApproval,
+              type: TransactionEnvelopeType.feeMarket,
+            },
+          },
+          CHAIN_IDS.MAINNET,
+        ),
+      ).toBe(ethReceived.toString());
+    });
+
+    it('returns postTxBalance minus preTxBalance less the cost of gas of the transaction and the approval tx for legacy txs', () => {
+      const preTxBalance = new Numeric('5000000', 10, EtherDenomination.WEI);
+      const postTxBalance = new Numeric('5500000', 10, EtherDenomination.WEI);
+      const gasUsed = new Numeric('28000', 10).toPrefixedHexString();
+      const gasUsedApproval = new Numeric('75000', 10).toPrefixedHexString();
+      const gasPrice = new Numeric('21', 10).toPrefixedHexString();
+      const gasPriceApproval = new Numeric('15', 10).toPrefixedHexString();
+      const gasCost = new Numeric(calcGasTotal(gasUsed, gasPrice), 16).add(
+        calcGasTotal(gasUsedApproval, gasPriceApproval),
+        16,
+      );
+      const ethReceived = postTxBalance
+        .minus(preTxBalance.minus(gasCost))
+        .toDenomination(EtherDenomination.ETH)
+        .round(6);
+      expect(
+        getSwapsTokensReceivedFromTxMeta(
+          'ETH',
+          {
+            txReceipt: {
+              gasUsed,
+              type: TransactionEnvelopeType.legacy,
+            },
+            txParams: {
+              gasPrice,
+            },
+            preTxBalance: preTxBalance.toPrefixedHexString(),
+            postTxBalance: postTxBalance.toPrefixedHexString(),
+            swapMetaData: { token_to_amount: '0x1' },
+          },
+          '0x00',
+          '0x00',
+          '8',
+          {
+            txReceipt: {
+              gasUsed: gasUsedApproval,
+              type: TransactionEnvelopeType.feeMarket,
+            },
+            txParams: {
+              gasPrice: gasPriceApproval,
+            },
+          },
+          CHAIN_IDS.MAINNET,
+        ),
+      ).toBe(ethReceived.toString());
+    });
+
+    it('returns value from tokenTransferLogs if not default token for network', () => {
+      const logs = [
+        {
+          topics: [TOKEN_TRANSFER_LOG_TOPIC_HASH, '', '0x00'],
+          address: '0x00',
+          data: new Numeric('10000', 10).toPrefixedHexString(),
+        },
+      ];
+      expect(
+        getSwapsTokensReceivedFromTxMeta(
+          'USDC',
+          {
+            txReceipt: { logs, status: '0x1' },
+          },
+          '0x00',
+          '0x00',
+          '8',
+          {
+            txReceipt: {},
+          },
+          CHAIN_IDS.MAINNET,
+        ),
+      ).toBe(calcTokenAmount(logs[0].data, 8).toString(10), 6);
+    });
   });
 });
diff --git a/shared/lib/transactions-controller-utils.js b/shared/lib/transactions-controller-utils.js
index 62cf3892b..3ee2484b6 100644
--- a/shared/lib/transactions-controller-utils.js
+++ b/shared/lib/transactions-controller-utils.js
@@ -4,7 +4,7 @@ import { TransactionEnvelopeType } from '../constants/transaction';
 import { Numeric } from '../modules/Numeric';
 import { isSwapsDefaultTokenSymbol } from '../modules/swaps.utils';
 
-const TOKEN_TRANSFER_LOG_TOPIC_HASH =
+export const TOKEN_TRANSFER_LOG_TOPIC_HASH =
   '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef';
 
 export const TRANSACTION_NO_CONTRACT_ERROR_KEY = 'transactionErrorNoContract';
@@ -82,7 +82,7 @@ export function getSwapsTokensReceivedFromTxMeta(
         ? txReceipt.effectiveGasPrice
         : txMeta.txParams.gasPrice,
     );
-    const totalGasCost = new Numeric(gasCost, 16).plus(approvalTxGasCost);
+    const totalGasCost = new Numeric(gasCost, 16).add(approvalTxGasCost);
 
     const preTxBalanceLessGasCost = new Numeric(txMeta.preTxBalance, 16).minus(
       totalGasCost,
@@ -93,7 +93,7 @@ export function getSwapsTokensReceivedFromTxMeta(
       16,
       EtherDenomination.WEI,
     )
-      .subtract(preTxBalanceLessGasCost)
+      .minus(preTxBalanceLessGasCost)
       .toDenomination(EtherDenomination.ETH)
       .toBase(10)
       .round(6);

From 970a5d4a776b0ac113e2152a9e17b4dc5574dcba Mon Sep 17 00:00:00 2001
From: ryanml <ryanlanese@gmail.com>
Date: Tue, 21 Feb 2023 06:08:47 -0700
Subject: [PATCH 05/36] Fix currency symbol in insufficient balance warning
 (#17820)

---
 ui/pages/send/gas-display/gas-display.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/ui/pages/send/gas-display/gas-display.js b/ui/pages/send/gas-display/gas-display.js
index bddeefdc6..7cd31230f 100644
--- a/ui/pages/send/gas-display/gas-display.js
+++ b/ui/pages/send/gas-display/gas-display.js
@@ -39,6 +39,7 @@ import {
 
 import { INSUFFICIENT_TOKENS_ERROR } from '../send.constants';
 import { getCurrentDraftTransaction } from '../../../ducks/send';
+import { getNativeCurrency } from '../../../ducks/metamask/metamask';
 import { showModal } from '../../../store/actions';
 import {
   addHexes,
@@ -61,7 +62,7 @@ export default function GasDisplay({ gasError }) {
   const { showFiatInTestnets, useNativeCurrencyAsPrimaryCurrency } =
     useSelector(getPreferences);
   const { provider, unapprovedTxs } = useSelector((state) => state.metamask);
-  const nativeCurrency = provider.ticker;
+  const nativeCurrency = useSelector(getNativeCurrency);
   const { chainId } = provider;
   const networkName = NETWORK_TO_NAME_MAP[chainId];
   const isInsufficientTokenError =
@@ -359,12 +360,9 @@ export default function GasDisplay({ gasError }) {
                 ) : (
                   <Typography variant={TypographyVariant.H7} align="left">
                     {t('insufficientCurrencyBuyOrReceive', [
-                      draftTransaction.asset.details?.symbol ?? nativeCurrency,
+                      nativeCurrency,
                       currentNetworkName,
-                      `${t('buyAsset', [
-                        draftTransaction.asset.details?.symbol ??
-                          nativeCurrency,
-                      ])}`,
+                      `${t('buyAsset', [nativeCurrency])}`,
                       <Button
                         type="inline"
                         className="gas-display__link"

From 2a6bcff4e2ff3ae416fad9a265838ef23981f8f4 Mon Sep 17 00:00:00 2001
From: ryanml <ryanlanese@gmail.com>
Date: Mon, 20 Feb 2023 18:29:50 -0700
Subject: [PATCH 06/36] Do not display experiment settings tab when there are
 no settings to show (#17765)

---
 ui/pages/settings/settings.component.js | 117 +++++++++++++-----------
 1 file changed, 62 insertions(+), 55 deletions(-)

diff --git a/ui/pages/settings/settings.component.js b/ui/pages/settings/settings.component.js
index 37fc79448..5c6a05497 100644
--- a/ui/pages/settings/settings.component.js
+++ b/ui/pages/settings/settings.component.js
@@ -72,6 +72,9 @@ class SettingsPage extends PureComponent {
     searchText: '',
   };
 
+  shouldRenderExperimentalTab =
+    process.env.TRANSACTION_SECURITY_PROVIDER || process.env.NFTS_V1;
+
   componentDidMount() {
     this.handleConversionDate();
   }
@@ -252,63 +255,65 @@ class SettingsPage extends PureComponent {
   renderTabs() {
     const { history, currentPath } = this.props;
     const { t } = this.context;
+    const tabs = [
+      {
+        content: t('general'),
+        icon: <i className="fa fa-cog" />,
+        key: GENERAL_ROUTE,
+      },
+      {
+        content: t('advanced'),
+        icon: <i className="fas fa-sliders-h" />,
+        key: ADVANCED_ROUTE,
+      },
+      {
+        content: t('contacts'),
+        icon: <Icon name={ICON_NAMES.BOOK} />,
+        key: CONTACT_LIST_ROUTE,
+      },
+      ///: BEGIN:ONLY_INCLUDE_IN(flask)
+      {
+        content: t('snaps'),
+        icon: (
+          <i className="fa fa-flask" title={t('snapsSettingsDescription')} />
+        ),
+        key: SNAPS_LIST_ROUTE,
+      },
+      ///: END:ONLY_INCLUDE_IN
+      {
+        content: t('securityAndPrivacy'),
+        icon: <i className="fa fa-lock" />,
+        key: SECURITY_ROUTE,
+      },
+      {
+        content: t('alerts'),
+        icon: <Icon name={ICON_NAMES.NOTIFICATION} />,
+        key: ALERTS_ROUTE,
+      },
+      {
+        content: t('networks'),
+        icon: <i className="fa fa-plug" />,
+        key: NETWORKS_ROUTE,
+      },
+    ];
+
+    if (this.shouldRenderExperimentalTab) {
+      tabs.push({
+        content: t('experimental'),
+        icon: <i className="fa fa-flask" />,
+        key: EXPERIMENTAL_ROUTE,
+      });
+    }
+
+    tabs.push({
+      content: t('about'),
+      icon: <i className="fa fa-info-circle" />,
+      key: ABOUT_US_ROUTE,
+    });
 
     return (
       <TabBar
-        tabs={[
-          {
-            content: t('general'),
-            icon: <i className="fa fa-cog" />,
-            key: GENERAL_ROUTE,
-          },
-          {
-            content: t('advanced'),
-            icon: <i className="fas fa-sliders-h" />,
-            key: ADVANCED_ROUTE,
-          },
-          {
-            content: t('contacts'),
-            icon: <i className="fa fa-address-book" />,
-            key: CONTACT_LIST_ROUTE,
-          },
-          ///: BEGIN:ONLY_INCLUDE_IN(flask)
-          {
-            content: t('snaps'),
-            icon: (
-              <i
-                className="fa fa-flask"
-                title={t('snapsSettingsDescription')}
-              />
-            ),
-            key: SNAPS_LIST_ROUTE,
-          },
-          ///: END:ONLY_INCLUDE_IN
-          {
-            content: t('securityAndPrivacy'),
-            icon: <i className="fa fa-lock" />,
-            key: SECURITY_ROUTE,
-          },
-          {
-            content: t('alerts'),
-            icon: <i className="fa fa-bell" />,
-            key: ALERTS_ROUTE,
-          },
-          {
-            content: t('networks'),
-            icon: <i className="fa fa-plug" />,
-            key: NETWORKS_ROUTE,
-          },
-          {
-            content: t('experimental'),
-            icon: <i className="fa fa-flask" />,
-            key: EXPERIMENTAL_ROUTE,
-          },
-          {
-            content: t('about'),
-            icon: <i className="fa fa-info-circle" />,
-            key: ABOUT_US_ROUTE,
-          },
-        ]}
+        tabs={tabs}
         isActive={(key) => {
           if (key === GENERAL_ROUTE && currentPath === SETTINGS_ROUTE) {
             return true;
@@ -352,7 +357,9 @@ class SettingsPage extends PureComponent {
           render={() => <AddNetwork />}
         />
         <Route exact path={SECURITY_ROUTE} component={SecurityTab} />
-        <Route exact path={EXPERIMENTAL_ROUTE} component={ExperimentalTab} />
+        {this.shouldRenderExperimentalTab ? (
+          <Route exact path={EXPERIMENTAL_ROUTE} component={ExperimentalTab} />
+        ) : null}
         <Route exact path={CONTACT_LIST_ROUTE} component={ContactListTab} />
         <Route exact path={CONTACT_ADD_ROUTE} component={ContactListTab} />
         <Route

From 591fe1a0a6570115f0d35be38cce9b843a3c68f3 Mon Sep 17 00:00:00 2001
From: Brad Decker <bhdecker84@gmail.com>
Date: Thu, 23 Feb 2023 12:16:55 -0600
Subject: [PATCH 07/36] avoid mutation of state in signTransaction action
 (#17772)

Co-authored-by: ryanml <ryanlanese@gmail.com>
---
 ui/ducks/send/send.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/ducks/send/send.js b/ui/ducks/send/send.js
index eb831437e..bd1346a90 100644
--- a/ui/ducks/send/send.js
+++ b/ui/ducks/send/send.js
@@ -1,7 +1,7 @@
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import BigNumber from 'bignumber.js';
 import { addHexPrefix } from 'ethereumjs-util';
-import { debounce } from 'lodash';
+import { cloneDeep, debounce } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
 import {
   decimalToHex,
@@ -2270,7 +2270,7 @@ export function signTransaction() {
       // merge in the modified txParams. Once the transaction has been modified
       // we can send that to the background to update the transaction in state.
       const unapprovedTxs = getUnapprovedTxs(state);
-      const unapprovedTx = unapprovedTxs[draftTransaction.id];
+      const unapprovedTx = cloneDeep(unapprovedTxs[draftTransaction.id]);
       // We only update the tx params that can be changed via the edit flow UX
       const eip1559OnlyTxParamsToUpdate = {
         data: txParams.data,

From 97013d802875b46793032c7904e0d82db7ef0ece Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Sat, 25 Feb 2023 01:58:42 +0700
Subject: [PATCH 08/36] Fix GetEncryptionKey TypeError Cannot destructure
 property 'msgParams' of 'txData' (#17808)

* fix ConfirmEncryptionPublicKey txData

* encrypt/decrypt: fix missing txData state

* rm console.log
---
 .../confirm-decrypt-message.component.js                 | 6 ++++++
 .../confirm-decrypt-message.container.js                 | 9 ++++-----
 .../confirm-encryption-public-key.component.js           | 6 ++++++
 .../confirm-encryption-public-key.container.js           | 7 ++++---
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.js b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.js
index 8938652f4..e175638b5 100644
--- a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.js
+++ b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import copyToClipboard from 'copy-to-clipboard';
 import classnames from 'classnames';
+import log from 'loglevel';
 
 import AccountListItem from '../../components/app/account-list-item';
 import Identicon from '../../components/ui/identicon';
@@ -298,6 +299,11 @@ export default class ConfirmDecryptMessage extends Component {
   };
 
   render = () => {
+    if (!this.props.txData) {
+      log.warn('ConfirmDecryptMessage Page: Missing txData prop.');
+      return null;
+    }
+
     return (
       <div className="request-decrypt-message__container">
         {this.renderHeader()}
diff --git a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.container.js b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.container.js
index cdc56ed5b..57358ecdd 100644
--- a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.container.js
+++ b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.container.js
@@ -27,11 +27,10 @@ function mapStateToProps(state) {
 
   const txData = unconfirmedTransactions[0];
 
-  const {
-    msgParams: { from },
-  } = txData;
-
-  const fromAccount = getTargetAccountWithSendEtherInfo(state, from);
+  const fromAccount = getTargetAccountWithSendEtherInfo(
+    state,
+    txData?.msgParams?.from,
+  );
 
   return {
     txData,
diff --git a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js
index 205f2d0cc..f7f58258e 100644
--- a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js
+++ b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js
@@ -1,5 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
+import log from 'loglevel';
 
 import AccountListItem from '../../components/app/account-list-item';
 import Identicon from '../../components/ui/identicon';
@@ -197,6 +198,11 @@ export default class ConfirmEncryptionPublicKey extends Component {
   };
 
   render = () => {
+    if (!this.props.txData) {
+      log.warn('ConfirmEncryptionPublicKey Page: Missing txData prop.');
+      return null;
+    }
+
     return (
       <div className="request-encryption-public-key__container">
         {this.renderHeader()}
diff --git a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js
index e512e99ff..5fd0a07af 100644
--- a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js
+++ b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js
@@ -28,9 +28,10 @@ function mapStateToProps(state) {
 
   const txData = unconfirmedTransactions[0];
 
-  const { msgParams: from } = txData;
-
-  const fromAccount = getTargetAccountWithSendEtherInfo(state, from);
+  const fromAccount = getTargetAccountWithSendEtherInfo(
+    state,
+    txData?.msgParams,
+  );
 
   return {
     txData,

From de5ea66d8d93cb05dceeaa11e4c1abb61f551ad4 Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Sat, 11 Feb 2023 22:17:12 +0700
Subject: [PATCH 09/36] Clean ConfirmTranscationPage component (#17546)

* ConfirmTransaction: rm unused metricEvent context

* ConfirmTransaction: rm unused mapToProps props:
- unapprovedTxs
- id

* ConfirmTransaction: convert to FC

* ConfirmTransaction: use const ORIGIN_METAMASK

* ConfirmTransaction: rm mapStateToProps

* ConfirmTransaction: mv confirm-transaction ducks

* ConfirmTransaction: mv getContractMethodData duck

* ConfirmTransaction: rm container file

* ConfirmTransaction: use ORIGIN_METAMASK const

* clean: rn totalUnapprovedCount -> totalUnapproved

* clean: reorder ConfirmTransaction & alphabetize

* clean: rn validTransactionId> isValidTransactionId

* clean: rn unconfirmedTransactions > unconfirmedTxs

* ConfirmationTransaction: add tests

* ConfirmTransaction: mv const

* ConfirmTransaction: update jest mock after merge

* ConfirmTransaction: fix from merge fault

* tests: update snapshot after mock-state updates
---
 .../confirm-transaction.component.js          | 57 +++++++++----------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/ui/pages/confirm-transaction/confirm-transaction.component.js b/ui/pages/confirm-transaction/confirm-transaction.component.js
index cfa563c5d..066fef15b 100644
--- a/ui/pages/confirm-transaction/confirm-transaction.component.js
+++ b/ui/pages/confirm-transaction/confirm-transaction.component.js
@@ -1,13 +1,14 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { Switch, Route, useHistory, useParams } from 'react-router-dom';
+
 import Loading from '../../components/ui/loading-screen';
-import ConfirmTransactionSwitch from '../confirm-transaction-switch';
 import ConfirmContractInteraction from '../confirm-contract-interaction';
-import ConfirmSendEther from '../confirm-send-ether';
 import ConfirmDeployContract from '../confirm-deploy-contract';
 import ConfirmDecryptMessage from '../confirm-decrypt-message';
 import ConfirmEncryptionPublicKey from '../confirm-encryption-public-key';
+import ConfirmSendEther from '../confirm-send-ether';
+import ConfirmTransactionSwitch from '../confirm-transaction-switch';
 
 import { ORIGIN_METAMASK } from '../../../shared/constants/app';
 
@@ -18,14 +19,14 @@ import {
 import { getMostRecentOverviewPage } from '../../ducks/history/history';
 import { getSendTo } from '../../ducks/send';
 import {
-  CONFIRM_TRANSACTION_ROUTE,
   CONFIRM_DEPLOY_CONTRACT_PATH,
   CONFIRM_SEND_ETHER_PATH,
   CONFIRM_TOKEN_METHOD_PATH,
-  SIGNATURE_REQUEST_PATH,
+  CONFIRM_TRANSACTION_ROUTE,
   DECRYPT_MESSAGE_REQUEST_PATH,
-  ENCRYPTION_PUBLIC_KEY_REQUEST_PATH,
   DEFAULT_ROUTE,
+  ENCRYPTION_PUBLIC_KEY_REQUEST_PATH,
+  SIGNATURE_REQUEST_PATH,
 } from '../../helpers/constants/routes';
 import { isTokenMethodAction } from '../../helpers/utils/transactions.util';
 import { usePrevious } from '../../hooks/usePrevious';
@@ -56,29 +57,31 @@ const ConfirmTransaction = () => {
   const mostRecentOverviewPage = useSelector(getMostRecentOverviewPage);
   const sendTo = useSelector(getSendTo);
   const unapprovedTxs = useSelector(getUnapprovedTransactions);
-  const unconfirmedTransactions = useSelector(
-    unconfirmedTransactionsListSelector,
-  );
+  const unconfirmedTxs = useSelector(unconfirmedTransactionsListSelector);
   const unconfirmedMessages = useSelector(unconfirmedTransactionsHashSelector);
 
-  const totalUnapprovedCount = unconfirmedTransactions.length || 0;
+  const totalUnapproved = unconfirmedTxs.length || 0;
+
   const transaction = useMemo(() => {
-    return totalUnapprovedCount
+    return totalUnapproved
       ? unapprovedTxs[paramsTransactionId] ||
           unconfirmedMessages[paramsTransactionId] ||
-          unconfirmedTransactions[0]
+          unconfirmedTxs[0]
       : {};
   }, [
     paramsTransactionId,
-    totalUnapprovedCount,
+    totalUnapproved,
     unapprovedTxs,
     unconfirmedMessages,
-    unconfirmedTransactions,
+    unconfirmedTxs,
   ]);
 
   const { id, type } = transaction;
   const transactionId = id && String(id);
   const isValidERC20TokenMethod = isTokenMethodAction(type);
+  const isValidTransactionId =
+    transactionId &&
+    (!paramsTransactionId || paramsTransactionId === transactionId);
 
   const prevParamsTransactionId = usePrevious(paramsTransactionId);
   const prevTransactionId = usePrevious(transactionId);
@@ -95,8 +98,6 @@ const ConfirmTransaction = () => {
   useEffect(() => {
     setIsMounted(true);
 
-    const { txParams: { data } = {}, origin } = transaction;
-
     getGasFeeEstimatesAndStartPolling().then((_pollingToken) => {
       if (isMounted) {
         setPollingToken(_pollingToken);
@@ -109,9 +110,11 @@ const ConfirmTransaction = () => {
 
     window.addEventListener('beforeunload', _beforeUnload);
 
-    if (!totalUnapprovedCount && !sendTo) {
+    if (!totalUnapproved && !sendTo) {
       history.replace(mostRecentOverviewPage);
     } else {
+      const { txParams: { data } = {}, origin } = transaction;
+
       if (origin !== ORIGIN_METAMASK) {
         dispatch(getContractMethodData(data));
       }
@@ -130,19 +133,19 @@ const ConfirmTransaction = () => {
   }, []);
 
   useEffect(() => {
-    const { txData: { txParams: { data } = {}, origin } = {} } = transaction;
-
     if (
       paramsTransactionId &&
       transactionId &&
       prevParamsTransactionId !== paramsTransactionId
     ) {
+      const { txData: { txParams: { data } = {}, origin } = {} } = transaction;
+
       dispatch(clearConfirmTransaction());
       dispatch(setTransactionToConfirm(paramsTransactionId));
       if (origin !== ORIGIN_METAMASK) {
         dispatch(getContractMethodData(data));
       }
-    } else if (prevTransactionId && !transactionId && !totalUnapprovedCount) {
+    } else if (prevTransactionId && !transactionId && !totalUnapproved) {
       dispatch(setDefaultHomeActiveTabName('activity')).then(() => {
         history.replace(DEFAULT_ROUTE);
       });
@@ -155,27 +158,23 @@ const ConfirmTransaction = () => {
     }
   }, [
     dispatch,
-    transaction,
-    paramsTransactionId,
-    transactionId,
     history,
     mostRecentOverviewPage,
+    paramsTransactionId,
     prevParamsTransactionId,
     prevTransactionId,
-    totalUnapprovedCount,
+    totalUnapproved,
+    transaction,
+    transactionId,
   ]);
 
-  const validTransactionId =
-    transactionId &&
-    (!paramsTransactionId || paramsTransactionId === transactionId);
-
-  if (isValidERC20TokenMethod && validTransactionId) {
+  if (isValidERC20TokenMethod && isValidTransactionId) {
     return <ConfirmTokenTransactionSwitch transaction={transaction} />;
   }
   // Show routes when state.confirmTransaction has been set and when either the ID in the params
   // isn't specified or is specified and matches the ID in state.confirmTransaction in order to
   // support URLs of /confirm-transaction or /confirm-transaction/<transactionId>
-  return validTransactionId ? (
+  return isValidTransactionId ? (
     <Switch>
       <Route
         exact

From 49d84140d9671e618499eea36098d4620a5e71a3 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Thu, 16 Feb 2023 20:23:15 +0530
Subject: [PATCH 10/36] Confirm transaction test (#17780)

---
 ui/helpers/utils/util.js                      |  2 +-
 .../confirm-transaction-base.component.js     |  2 +-
 .../confirm-transaction.transaction.test.js   | 47 +++++++++++++++++++
 3 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 ui/pages/confirm-transaction/confirm-transaction.transaction.test.js

diff --git a/ui/helpers/utils/util.js b/ui/helpers/utils/util.js
index 05befbe17..eeef079bf 100644
--- a/ui/helpers/utils/util.js
+++ b/ui/helpers/utils/util.js
@@ -549,7 +549,7 @@ export function getSnapDerivationPathName(path, curve) {
 /**
  * The method escape RTL character in string
  *
- * @param {any} value
+ * @param {*} value
  * @returns {(string|*)} escaped string or original param value
  */
 export const sanitizeString = (value) => {
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 0f38bfc77..adc7e7455 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
@@ -93,7 +93,7 @@ export default class ConfirmTransactionBase extends Component {
     sendTransaction: PropTypes.func,
     showTransactionConfirmedModal: PropTypes.func,
     showRejectTransactionsConfirmationModal: PropTypes.func,
-    toAccounts: PropTypes.object,
+    toAccounts: PropTypes.array,
     toAddress: PropTypes.string,
     tokenData: PropTypes.object,
     tokenProps: PropTypes.object,
diff --git a/ui/pages/confirm-transaction/confirm-transaction.transaction.test.js b/ui/pages/confirm-transaction/confirm-transaction.transaction.test.js
new file mode 100644
index 000000000..9814476f2
--- /dev/null
+++ b/ui/pages/confirm-transaction/confirm-transaction.transaction.test.js
@@ -0,0 +1,47 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+
+import { renderWithProvider } from '../../../test/lib/render-helpers';
+import { setBackgroundConnection } from '../../../test/jest';
+import mockState from '../../../test/data/mock-state.json';
+import {
+  CONFIRM_SEND_ETHER_PATH,
+  CONFIRM_TRANSACTION_ROUTE,
+} from '../../helpers/constants/routes';
+
+import ConfirmTransaction from './confirm-transaction.component';
+
+const middleware = [thunk];
+
+setBackgroundConnection({
+  getGasFeeTimeEstimate: jest.fn(),
+  getGasFeeEstimatesAndStartPolling: jest.fn(),
+  promisifiedBackground: jest.fn(),
+  tryReverseResolveAddress: jest.fn(),
+  getNextNonce: jest.fn(),
+  addKnownMethodData: jest.fn(),
+});
+
+describe('Confirm Transaction', () => {
+  const unapprovedTransactionId = Object.keys(
+    mockState.metamask.unapprovedTxs,
+  )[0];
+  it('should render correct information for approve transaction with value', () => {
+    const store = configureMockStore(middleware)({
+      ...mockState,
+      confirmTransaction: {
+        txData: mockState.metamask.unapprovedTxs[unapprovedTransactionId],
+      },
+    });
+    const { getByText, getByRole } = renderWithProvider(
+      <ConfirmTransaction actionKey="confirm" />,
+      store,
+      `${CONFIRM_TRANSACTION_ROUTE}/${unapprovedTransactionId}${CONFIRM_SEND_ETHER_PATH}`,
+    );
+    expect(getByText('0xb19...0c5e')).toBeInTheDocument();
+    expect(getByRole('button', { name: 'Details' })).toBeInTheDocument();
+    expect(getByRole('button', { name: 'Data' })).toBeInTheDocument();
+    expect(getByRole('button', { name: 'Hex' })).toBeInTheDocument();
+  });
+});

From 1d733194eaa0b11d120308c6b949b3d358531650 Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Fri, 17 Feb 2023 22:11:50 +0700
Subject: [PATCH 11/36] Cleanup: clearTimeout on useEffect for gas estimation
 and prevent state update on unmounted ConfirmTransactionBase (#17804)

---
 ui/hooks/useShouldAnimateGasEstimations.js        | 15 ++++++++++-----
 .../confirm-transaction-base.component.js         |  8 ++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ui/hooks/useShouldAnimateGasEstimations.js b/ui/hooks/useShouldAnimateGasEstimations.js
index 882950a68..5bd60b80b 100644
--- a/ui/hooks/useShouldAnimateGasEstimations.js
+++ b/ui/hooks/useShouldAnimateGasEstimations.js
@@ -44,13 +44,18 @@ export function useShouldAnimateGasEstimations() {
   }, [dispatch, isGasLoadingAnimationActive, showLoadingAnimation]);
 
   useEffect(() => {
-    if (
-      isGasLoadingAnimationActive === true &&
-      showLoadingAnimation === false
-    ) {
-      setTimeout(() => {
+    let timer;
+
+    if (isGasLoadingAnimationActive && !showLoadingAnimation) {
+      timer = setTimeout(() => {
         dispatch(toggleGasLoadingAnimation(false));
       }, 2000);
     }
+
+    return () => {
+      if (timer) {
+        clearTimeout(timer);
+      }
+    };
   }, [dispatch, isGasLoadingAnimationActive, showLoadingAnimation]);
 }
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 adc7e7455..28f13294c 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
@@ -866,6 +866,10 @@ export default class ConfirmTransactionBase extends Component {
         sendTransaction(txData)
           .then(() => {
             clearConfirmTransaction();
+            if (!this._isMounted) {
+              return;
+            }
+
             this.setState(
               {
                 submitting: false,
@@ -877,6 +881,10 @@ export default class ConfirmTransactionBase extends Component {
             );
           })
           .catch((error) => {
+            if (!this._isMounted) {
+              return;
+            }
+
             this.setState({
               submitting: false,
               submitError: error.message,

From 5691a00e204ee0a701ce49491d1e4b384aff199a Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Fri, 24 Feb 2023 22:37:26 +0530
Subject: [PATCH 12/36] Fix state in confirm transaction (#17838)

---
 test/e2e/fixture-builder.js                   | 48 ++++++---
 test/e2e/tests/multiple-transactions.spec.js  | 98 +++++++++++++++++++
 test/e2e/tests/navigate-transactions.spec.js  |  1 +
 .../confirm-transaction-base.component.js     |  5 +-
 .../confirm-transaction.component.js          | 29 ++++--
 5 files changed, 155 insertions(+), 26 deletions(-)
 create mode 100644 test/e2e/tests/multiple-transactions.spec.js

diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js
index 7f546a12f..8ae2232e4 100644
--- a/test/e2e/fixture-builder.js
+++ b/test/e2e/fixture-builder.js
@@ -655,14 +655,16 @@ class FixtureBuilder {
           chainId: CHAIN_IDS.LOCALHOST,
           dappSuggestedGasFees: {
             gas: '0x5208',
-            gasPrice: '0x4a817c800',
+            maxFeePerGas: '0x59682f0c',
+            maxPriorityFeePerGas: '0x59682f00',
           },
           history: [
             {
               chainId: CHAIN_IDS.LOCALHOST,
               dappSuggestedGasFees: {
                 gas: '0x5208',
-                gasPrice: '0x4a817c800',
+                maxFeePerGas: '0x59682f0c',
+                maxPriorityFeePerGas: '0x59682f00',
               },
               id: 7911313280012623,
               loadingDefaults: true,
@@ -673,7 +675,8 @@ class FixtureBuilder {
               txParams: {
                 from: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
                 gas: '0x5208',
-                gasPrice: '0x4a817c800',
+                maxFeePerGas: '0x59682f0c',
+                maxPriorityFeePerGas: '0x59682f00',
                 to: '0x2f318c334780961fb129d2a6c30d0763d9a5c970',
                 value: '0x29a2241af62c0000',
               },
@@ -698,7 +701,8 @@ class FixtureBuilder {
           txParams: {
             from: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
             gas: '0x5208',
-            gasPrice: '0x4a817c800',
+            maxFeePerGas: '0x59682f0c',
+            maxPriorityFeePerGas: '0x59682f00',
             to: '0x2f318c334780961fb129d2a6c30d0763d9a5c970',
             value: '0x29a2241af62c0000',
           },
@@ -708,14 +712,16 @@ class FixtureBuilder {
           chainId: CHAIN_IDS.LOCALHOST,
           dappSuggestedGasFees: {
             gas: '0x5208',
-            gasPrice: '0x4a817c800',
+            maxFeePerGas: '0x59682f0c',
+            maxPriorityFeePerGas: '0x59682f00',
           },
           history: [
             {
               chainId: CHAIN_IDS.LOCALHOST,
               dappSuggestedGasFees: {
                 gas: '0x5208',
-                gasPrice: '0x4a817c800',
+                maxFeePerGas: '0x59682f0c',
+                maxPriorityFeePerGas: '0x59682f00',
               },
               id: 7911313280012624,
               loadingDefaults: true,
@@ -726,7 +732,8 @@ class FixtureBuilder {
               txParams: {
                 from: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
                 gas: '0x5208',
-                gasPrice: '0x4a817c800',
+                maxFeePerGas: '0x59682f0c',
+                maxPriorityFeePerGas: '0x59682f00',
                 to: '0x2f318c334780961fb129d2a6c30d0763d9a5c970',
                 value: '0x29a2241af62c0000',
               },
@@ -751,7 +758,8 @@ class FixtureBuilder {
           txParams: {
             from: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
             gas: '0x5208',
-            gasPrice: '0x4a817c800',
+            maxFeePerGas: '0x59682f0c',
+            maxPriorityFeePerGas: '0x59682f00',
             to: '0x2f318c334780961fb129d2a6c30d0763d9a5c970',
             value: '0x29a2241af62c0000',
           },
@@ -761,14 +769,16 @@ class FixtureBuilder {
           chainId: CHAIN_IDS.LOCALHOST,
           dappSuggestedGasFees: {
             gas: '0x5208',
-            gasPrice: '0x4a817c800',
+            maxFeePerGas: '0x59682f0c',
+            maxPriorityFeePerGas: '0x59682f00',
           },
           history: [
             {
               chainId: CHAIN_IDS.LOCALHOST,
               dappSuggestedGasFees: {
                 gas: '0x5208',
-                gasPrice: '0x4a817c800',
+                maxFeePerGas: '0x59682f0c',
+                maxPriorityFeePerGas: '0x59682f00',
               },
               id: 7911313280012625,
               loadingDefaults: true,
@@ -779,7 +789,8 @@ class FixtureBuilder {
               txParams: {
                 from: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
                 gas: '0x5208',
-                gasPrice: '0x4a817c800',
+                maxFeePerGas: '0x59682f0c',
+                maxPriorityFeePerGas: '0x59682f00',
                 to: '0x2f318c334780961fb129d2a6c30d0763d9a5c970',
                 value: '0x29a2241af62c0000',
               },
@@ -804,7 +815,8 @@ class FixtureBuilder {
           txParams: {
             from: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
             gas: '0x5208',
-            gasPrice: '0x4a817c800',
+            maxFeePerGas: '0x59682f0c',
+            maxPriorityFeePerGas: '0x59682f00',
             to: '0x2f318c334780961fb129d2a6c30d0763d9a5c970',
             value: '0x29a2241af62c0000',
           },
@@ -814,14 +826,16 @@ class FixtureBuilder {
           chainId: CHAIN_IDS.LOCALHOST,
           dappSuggestedGasFees: {
             gas: '0x5208',
-            gasPrice: '0x4a817c800',
+            maxFeePerGas: '0x59682f0c',
+            maxPriorityFeePerGas: '0x59682f00',
           },
           history: [
             {
               chainId: CHAIN_IDS.LOCALHOST,
               dappSuggestedGasFees: {
                 gas: '0x5208',
-                gasPrice: '0x4a817c800',
+                maxFeePerGas: '0x59682f0c',
+                maxPriorityFeePerGas: '0x59682f00',
               },
               id: 7911313280012626,
               loadingDefaults: true,
@@ -832,7 +846,8 @@ class FixtureBuilder {
               txParams: {
                 from: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
                 gas: '0x5208',
-                gasPrice: '0x4a817c800',
+                maxFeePerGas: '0x59682f0c',
+                maxPriorityFeePerGas: '0x59682f00',
                 to: '0x2f318c334780961fb129d2a6c30d0763d9a5c970',
                 value: '0x29a2241af62c0000',
               },
@@ -857,7 +872,8 @@ class FixtureBuilder {
           txParams: {
             from: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
             gas: '0x5208',
-            gasPrice: '0x4a817c800',
+            maxFeePerGas: '0x59682f0c',
+            maxPriorityFeePerGas: '0x59682f00',
             to: '0x2f318c334780961fb129d2a6c30d0763d9a5c970',
             value: '0x29a2241af62c0000',
           },
diff --git a/test/e2e/tests/multiple-transactions.spec.js b/test/e2e/tests/multiple-transactions.spec.js
new file mode 100644
index 000000000..bc29c3308
--- /dev/null
+++ b/test/e2e/tests/multiple-transactions.spec.js
@@ -0,0 +1,98 @@
+const { convertToHexValue, withFixtures } = require('../helpers');
+const FixtureBuilder = require('../fixture-builder');
+
+describe('Confirm transactions', function () {
+  const ganacheOptions = {
+    hardfork: 'london',
+    accounts: [
+      {
+        secretKey:
+          '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
+        balance: convertToHexValue(25000000000000000000),
+      },
+    ],
+  };
+  it('should be able to confirm multiple transactions', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder()
+          .withTransactionControllerMultipleTransactions()
+          .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);
+
+        // confirm multiple transactions
+        await driver.waitForSelector({
+          text: 'Reject 4 transactions',
+          tag: 'a',
+        });
+        await driver.clickElement({ text: 'Confirm', tag: 'button' });
+        await driver.waitForSelector({
+          text: 'Reject 3 transactions',
+          tag: 'a',
+        });
+        await driver.clickElement({ text: 'Confirm', tag: 'button' });
+        await driver.waitForSelector({
+          text: 'Reject 2 transactions',
+          tag: 'a',
+        });
+        await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+        await driver.waitForElementNotPresent('.loading-overlay__spinner');
+        await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+        await driver.clickElement('[data-testid="home__activity-tab"]');
+        await driver.wait(async () => {
+          const confirmedTxes = await driver.findElements(
+            '.transaction-list__completed-transactions .transaction-list-item',
+          );
+          return confirmedTxes.length === 4;
+        }, 10000);
+      },
+    );
+  });
+
+  it('should be able to reject multiple transactions', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder()
+          .withTransactionControllerMultipleTransactions()
+          .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);
+
+        // confirm multiple transactions
+        await driver.waitForSelector({
+          text: 'Reject 4 transactions',
+          tag: 'a',
+        });
+        await driver.clickElement({ text: 'Reject', tag: 'button' });
+        await driver.waitForSelector({
+          text: 'Reject 3 transactions',
+          tag: 'a',
+        });
+        await driver.clickElement({ text: 'Reject', tag: 'button' });
+        await driver.waitForSelector({
+          text: 'Reject 2 transactions',
+          tag: 'a',
+        });
+        await driver.clickElement({ text: 'Reject', tag: 'button' });
+
+        await driver.waitForElementNotPresent('.loading-overlay__spinner');
+        await driver.clickElement({ text: 'Reject', tag: 'button' });
+
+        await driver.waitForSelector('[data-testid="home__activity-tab"]');
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/navigate-transactions.spec.js b/test/e2e/tests/navigate-transactions.spec.js
index d2f964b8e..4d4136732 100644
--- a/test/e2e/tests/navigate-transactions.spec.js
+++ b/test/e2e/tests/navigate-transactions.spec.js
@@ -4,6 +4,7 @@ const FixtureBuilder = require('../fixture-builder');
 
 describe('Navigate transactions', function () {
   const ganacheOptions = {
+    hardfork: 'london',
     accounts: [
       {
         secretKey:
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 28f13294c..fdb8d8fba 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
@@ -776,14 +776,12 @@ export default class ConfirmTransactionBase extends Component {
       cancelTransaction,
       history,
       mostRecentOverviewPage,
-      clearConfirmTransaction,
       updateCustomNonce,
     } = this.props;
 
     this._removeBeforeUnload();
     updateCustomNonce('');
     cancelTransaction(txData).then(() => {
-      clearConfirmTransaction();
       history.push(mostRecentOverviewPage);
     });
   }
@@ -791,7 +789,6 @@ export default class ConfirmTransactionBase extends Component {
   handleSubmit() {
     const {
       sendTransaction,
-      clearConfirmTransaction,
       txData,
       history,
       mostRecentOverviewPage,
@@ -865,7 +862,6 @@ export default class ConfirmTransactionBase extends Component {
 
         sendTransaction(txData)
           .then(() => {
-            clearConfirmTransaction();
             if (!this._isMounted) {
               return;
             }
@@ -995,6 +991,7 @@ export default class ConfirmTransactionBase extends Component {
   componentWillUnmount() {
     this._beforeUnloadForGasPolling();
     this._removeBeforeUnload();
+    this.props.clearConfirmTransaction();
   }
 
   supportsEIP1559 =
diff --git a/ui/pages/confirm-transaction/confirm-transaction.component.js b/ui/pages/confirm-transaction/confirm-transaction.component.js
index 066fef15b..698a729fe 100644
--- a/ui/pages/confirm-transaction/confirm-transaction.component.js
+++ b/ui/pages/confirm-transaction/confirm-transaction.component.js
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { Switch, Route, useHistory, useParams } from 'react-router-dom';
 
@@ -61,8 +61,7 @@ const ConfirmTransaction = () => {
   const unconfirmedMessages = useSelector(unconfirmedTransactionsHashSelector);
 
   const totalUnapproved = unconfirmedTxs.length || 0;
-
-  const transaction = useMemo(() => {
+  const getTransaction = useCallback(() => {
     return totalUnapproved
       ? unapprovedTxs[paramsTransactionId] ||
           unconfirmedMessages[paramsTransactionId] ||
@@ -75,10 +74,27 @@ const ConfirmTransaction = () => {
     unconfirmedMessages,
     unconfirmedTxs,
   ]);
+  const [transaction, setTransaction] = useState(getTransaction);
+
+  useEffect(() => {
+    const tx = getTransaction();
+    setTransaction(tx);
+    if (tx?.id) {
+      dispatch(setTransactionToConfirm(tx.id));
+    }
+  }, [
+    dispatch,
+    getTransaction,
+    paramsTransactionId,
+    totalUnapproved,
+    unapprovedTxs,
+    unconfirmedMessages,
+    unconfirmedTxs,
+  ]);
 
   const { id, type } = transaction;
   const transactionId = id && String(id);
-  const isValidERC20TokenMethod = isTokenMethodAction(type);
+  const isValidTokenMethod = isTokenMethodAction(type);
   const isValidTransactionId =
     transactionId &&
     (!paramsTransactionId || paramsTransactionId === transactionId);
@@ -152,7 +168,8 @@ const ConfirmTransaction = () => {
     } else if (
       prevTransactionId &&
       transactionId &&
-      prevTransactionId !== transactionId
+      prevTransactionId !== transactionId &&
+      paramsTransactionId !== transactionId
     ) {
       history.replace(mostRecentOverviewPage);
     }
@@ -168,7 +185,7 @@ const ConfirmTransaction = () => {
     transactionId,
   ]);
 
-  if (isValidERC20TokenMethod && isValidTransactionId) {
+  if (isValidTokenMethod && isValidTransactionId) {
     return <ConfirmTokenTransactionSwitch transaction={transaction} />;
   }
   // Show routes when state.confirmTransaction has been set and when either the ID in the params

From 44ac0d9567682ccc864fa8ef78304f7a7b9ba881 Mon Sep 17 00:00:00 2001
From: seaona <54408225+seaona@users.noreply.github.com>
Date: Fri, 10 Feb 2023 15:35:45 +0100
Subject: [PATCH 13/36] e2e Send to Multisig Wallet (#17565)

* e2e Send to Multisig Wallet

* Update test-dapp dependency to 5.4.0

* Added test-dapp update version to yarn lock

* disable ff

---------

Co-authored-by: Pedro Figueiredo <pedro.figueiredo@consensys.net>
---
 .github/workflows/fitness-functions.yml |  2 +-
 package.json                            |  2 +-
 test/e2e/seeder/smart-contracts.js      |  9 ++++
 test/e2e/tests/send-eth.spec.js         | 60 +++++++++++++++++++++++++
 yarn.lock                               | 10 ++---
 5 files changed, 76 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/fitness-functions.yml b/.github/workflows/fitness-functions.yml
index 3d2122dbf..7b9cbdd48 100644
--- a/.github/workflows/fitness-functions.yml
+++ b/.github/workflows/fitness-functions.yml
@@ -25,4 +25,4 @@ jobs:
           git fetch origin $HEAD_REF
           git fetch origin $BASE_REF
           git diff origin/$BASE_REF origin/$HEAD_REF -- . ':(exclude)development/fitness-functions/*' > diff
-          npm run fitness-functions -- "ci" "./diff"
+          # npm run fitness-functions -- "ci" "./diff"
diff --git a/package.json b/package.json
index c20342130..9e1cf0818 100644
--- a/package.json
+++ b/package.json
@@ -372,7 +372,7 @@
     "@metamask/eslint-config-typescript": "^9.0.1",
     "@metamask/forwarder": "^1.1.0",
     "@metamask/phishing-warning": "^1.2.1",
-    "@metamask/test-dapp": "^5.2.1",
+    "@metamask/test-dapp": "^5.4.0",
     "@sentry/cli": "^1.58.0",
     "@storybook/addon-a11y": "^6.5.13",
     "@storybook/addon-actions": "^6.5.13",
diff --git a/test/e2e/seeder/smart-contracts.js b/test/e2e/seeder/smart-contracts.js
index 3c61cf062..70c60b1c1 100644
--- a/test/e2e/seeder/smart-contracts.js
+++ b/test/e2e/seeder/smart-contracts.js
@@ -7,6 +7,8 @@ const {
   collectiblesBytecode,
   failingContractAbi,
   failingContractBytecode,
+  multisigAbi,
+  multisigBytecode,
 } = require('@metamask/test-dapp/dist/constants.json');
 
 const hstFactory = {
@@ -33,11 +35,17 @@ const failingContract = {
   abi: failingContractAbi,
 };
 
+const multisigFactory = {
+  bytecode: multisigBytecode,
+  abi: multisigAbi,
+};
+
 const SMART_CONTRACTS = {
   HST: 'hst',
   COLLECTIBLES: 'collectibles',
   PIGGYBANK: 'piggybank',
   FAILING: 'failing',
+  MULTISIG: 'multisig',
 };
 
 const contractConfiguration = {
@@ -45,6 +53,7 @@ const contractConfiguration = {
   [SMART_CONTRACTS.COLLECTIBLES]: collectiblesFactory,
   [SMART_CONTRACTS.PIGGYBANK]: piggybankFactory,
   [SMART_CONTRACTS.FAILING]: failingContract,
+  [SMART_CONTRACTS.MULTISIG]: multisigFactory,
 };
 
 module.exports = { SMART_CONTRACTS, contractConfiguration };
diff --git a/test/e2e/tests/send-eth.spec.js b/test/e2e/tests/send-eth.spec.js
index 25fe7edbe..9e8ec1594 100644
--- a/test/e2e/tests/send-eth.spec.js
+++ b/test/e2e/tests/send-eth.spec.js
@@ -1,4 +1,5 @@
 const { strict: assert } = require('assert');
+const { SMART_CONTRACTS } = require('../seeder/smart-contracts');
 const { convertToHexValue, withFixtures, tinyDelayMs } = require('../helpers');
 const FixtureBuilder = require('../fixture-builder');
 
@@ -364,3 +365,62 @@ describe('Send ETH from dapp using advanced gas controls', function () {
     );
   });
 });
+
+describe('Send ETH from inside MetaMask to a Multisig Address', function () {
+  const smartContract = SMART_CONTRACTS.MULTISIG;
+  const ganacheOptions = {
+    accounts: [
+      {
+        secretKey:
+          '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
+        balance: convertToHexValue(25000000000000000000),
+      },
+    ],
+  };
+  it('finds the transaction in the transactions list', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().build(),
+        ganacheOptions,
+        smartContract,
+        title: this.test.title,
+      },
+      async ({ driver, contractRegistry }) => {
+        const contractAddress = await contractRegistry.getContractAddress(
+          smartContract,
+        );
+        await driver.navigate();
+        await driver.fill('#password', 'correct horse battery staple');
+        await driver.press('#password', driver.Key.ENTER);
+
+        await driver.clickElement('[data-testid="eth-overview-send"]');
+
+        await driver.fill(
+          'input[placeholder="Search, public address (0x), or ENS"]',
+          contractAddress,
+        );
+
+        const inputAmount = await driver.findElement('.unit-input__input');
+        await inputAmount.fill('1');
+
+        // Continue to next screen
+        await driver.clickElement({ text: 'Next', tag: 'button' });
+
+        await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+        await driver.clickElement('[data-testid="home__activity-tab"]');
+        await driver.wait(async () => {
+          const confirmedTxes = await driver.findElements(
+            '.transaction-list__completed-transactions .transaction-list-item',
+          );
+          return confirmedTxes.length === 1;
+        }, 10000);
+
+        const failedTx = await driver.isElementPresent(
+          '.transaction-status-label--failed',
+        );
+        assert.equal(failedTx, false, 'Transaction failed');
+      },
+    );
+  });
+});
diff --git a/yarn.lock b/yarn.lock
index dc5866429..4b20541e2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4272,10 +4272,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/test-dapp@npm:^5.2.1":
-  version: 5.2.1
-  resolution: "@metamask/test-dapp@npm:5.2.1"
-  checksum: 51e845f4238013f83bb632607e4c9b691f6f8b56e4b4fc5653cc0b00aac621943fc7eb0c6a94c3cbb36f1ff6febf836e21024dbd8c42d3ada3fea09b89c070af
+"@metamask/test-dapp@npm:^5.4.0":
+  version: 5.4.0
+  resolution: "@metamask/test-dapp@npm:5.4.0"
+  checksum: dd21652f8478befe7e7b1ccd3c04d6fe49efa29867476b1d83680d2babd2a616361ade11a0f86a1e13a55848299b6ab6ddfae2335d7b4bab692efb350fa1523b
   languageName: node
   linkType: hard
 
@@ -24210,7 +24210,7 @@ __metadata:
     "@metamask/snaps-ui": ^0.28.0
     "@metamask/snaps-utils": ^0.28.0
     "@metamask/subject-metadata-controller": ^1.0.0
-    "@metamask/test-dapp": ^5.2.1
+    "@metamask/test-dapp": ^5.4.0
     "@metamask/utils": ^3.4.1
     "@ngraveio/bc-ur": ^1.1.6
     "@popperjs/core": ^2.4.0

From de26c9e4a145e7a519638320d2e067c931b4e6cd Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Fri, 10 Feb 2023 19:33:11 -0600
Subject: [PATCH 14/36] UX: Replace all fa-bell instances with Notification
 icon (#17524)

* UX: Replace all fa-bell instances with Notification icon

* Fix flask comment fencing

* Fix import error
---
 .../account-menu/account-menu.component.js    | 10 ++++++++--
 .../permissions-connect-permission-list.js    |  2 +-
 ui/components/app/tab-bar/tab-bar.stories.js  |  3 ++-
 ui/helpers/constants/settings.js              |  3 ++-
 ui/helpers/utils/permission.js                |  3 ++-
 .../settings-search-list.js                   | 20 +++++++++++--------
 ui/pages/settings/settings.component.js       |  1 +
 7 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/ui/components/app/account-menu/account-menu.component.js b/ui/components/app/account-menu/account-menu.component.js
index 673987563..d0b9d7084 100644
--- a/ui/components/app/account-menu/account-menu.component.js
+++ b/ui/components/app/account-menu/account-menu.component.js
@@ -40,8 +40,14 @@ import IconImport from '../../ui/icon/icon-import';
 import Button from '../../ui/button';
 import SearchIcon from '../../ui/icon/search-icon';
 import { SUPPORT_LINK } from '../../../../shared/lib/ui-utils';
-import { Icon, ICON_NAMES } from '../../component-library';
 import { Color } from '../../../helpers/constants/design-system';
+import {
+  Icon,
+  ICON_NAMES,
+  ///: BEGIN:ONLY_INCLUDE_IN(flask)
+  ICON_SIZES,
+  ///: END:ONLY_INCLUDE_IN
+} from '../../component-library';
 import KeyRingLabel from './keyring-label';
 
 export function AccountMenuItem(props) {
@@ -430,7 +436,7 @@ export default class AccountMenu extends Component {
               }}
               icon={
                 <div className="account-menu__notifications">
-                  <i className="fa fa-bell fa-xl" />
+                  <Icon name={ICON_NAMES.NOTIFICATION} size={ICON_SIZES.LG} />
                   {unreadNotificationsCount > 0 && (
                     <div className="account-menu__notifications__count">
                       {unreadNotificationsCount}
diff --git a/ui/components/app/permissions-connect-permission-list/permissions-connect-permission-list.js b/ui/components/app/permissions-connect-permission-list/permissions-connect-permission-list.js
index aadd20d0a..da8fa8355 100644
--- a/ui/components/app/permissions-connect-permission-list/permissions-connect-permission-list.js
+++ b/ui/components/app/permissions-connect-permission-list/permissions-connect-permission-list.js
@@ -20,7 +20,7 @@ function getDescriptionNode(
 ) {
   return (
     <div className="permission" key={`${permissionName}-${index}`}>
-      <i className={leftIcon} />
+      {typeof leftIcon === 'string' ? <i className={leftIcon} /> : leftIcon}
       {label}
       {rightIcon && <i className={rightIcon} />}
     </div>
diff --git a/ui/components/app/tab-bar/tab-bar.stories.js b/ui/components/app/tab-bar/tab-bar.stories.js
index 7cb3c1bec..096a64005 100644
--- a/ui/components/app/tab-bar/tab-bar.stories.js
+++ b/ui/components/app/tab-bar/tab-bar.stories.js
@@ -1,4 +1,5 @@
 import React, { useState } from 'react';
+import { Icon, ICON_NAMES } from '../../component-library';
 import TabBar from '.';
 
 export default {
@@ -38,7 +39,7 @@ export default {
         key: 'securityAndPrivacy',
       },
       {
-        icon: <i className="fa fa-bell" />,
+        icon: <Icon name={ICON_NAMES.NOTIFICATION} />,
         content: 'Alerts',
         key: 'alerts',
       },
diff --git a/ui/helpers/constants/settings.js b/ui/helpers/constants/settings.js
index 7c92aebe0..1afe88597 100644
--- a/ui/helpers/constants/settings.js
+++ b/ui/helpers/constants/settings.js
@@ -1,3 +1,4 @@
+import { ICON_NAMES } from '../../components/component-library';
 import {
   ALERTS_ROUTE,
   ADVANCED_ROUTE,
@@ -223,7 +224,7 @@ export const SETTINGS_CONSTANTS = [
     sectionMessage: (t) => t('alertSettingsUnconnectedAccount'),
     descriptionMessage: (t) => t('alertSettingsUnconnectedAccount'),
     route: `${ALERTS_ROUTE}#unconnected-account`,
-    icon: 'fa fa-bell',
+    iconName: ICON_NAMES.NOTIFICATION,
   },
   {
     tabMessage: (t) => t('alerts'),
diff --git a/ui/helpers/utils/permission.js b/ui/helpers/utils/permission.js
index fcdcf349b..de60aaf57 100644
--- a/ui/helpers/utils/permission.js
+++ b/ui/helpers/utils/permission.js
@@ -14,6 +14,7 @@ import {
 } from '../../../shared/constants/permissions';
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
 import { SNAPS_METADATA } from '../../../shared/constants/snaps';
+import { Icon, ICON_NAMES } from '../../components/component-library';
 import { coinTypeToProtocolName, getSnapDerivationPathName } from './util';
 ///: END:ONLY_INCLUDE_IN
 
@@ -40,7 +41,7 @@ const PERMISSION_DESCRIPTIONS = deepFreeze({
     weight: 3,
   }),
   [RestrictedMethods.snap_notify]: (t) => ({
-    leftIcon: 'fas fa-bell',
+    leftIcon: <Icon name={ICON_NAMES.NOTIFICATION} />,
     label: t('permission_notifications'),
     rightIcon: null,
     weight: 3,
diff --git a/ui/pages/settings/settings-search-list/settings-search-list.js b/ui/pages/settings/settings-search-list/settings-search-list.js
index 171e7ec5d..7ed1b536a 100644
--- a/ui/pages/settings/settings-search-list/settings-search-list.js
+++ b/ui/pages/settings/settings-search-list/settings-search-list.js
@@ -4,6 +4,7 @@ import classnames from 'classnames';
 import { highlightSearchedText } from '../../../helpers/utils/settings-search';
 import { I18nContext } from '../../../contexts/i18n';
 import IconCaretRight from '../../../components/ui/icon/icon-caret-right';
+import { Icon } from '../../../components/component-library';
 
 export default function SettingsSearchList({ results, onClickSetting }) {
   const t = useContext(I18nContext);
@@ -13,7 +14,7 @@ export default function SettingsSearchList({ results, onClickSetting }) {
   return (
     <div className="settings-page__header__search__list">
       {results.slice(0, 5).map((result) => {
-        const { icon, tabMessage, sectionMessage, route } = result;
+        const { icon, iconName, tabMessage, sectionMessage, route } = result;
         return (
           Boolean(icon || tabMessage || sectionMessage) && (
             <div key={`settings_${route}`}>
@@ -21,13 +22,16 @@ export default function SettingsSearchList({ results, onClickSetting }) {
                 className="settings-page__header__search__list__item"
                 onClick={() => onClickSetting(result)}
               >
-                <i
-                  className={classnames(
-                    'settings-page__header__search__list__item__icon',
-                    icon,
-                  )}
-                />
-
+                {iconName ? (
+                  <Icon name={iconName} />
+                ) : (
+                  <i
+                    className={classnames(
+                      'settings-page__header__search__list__item__icon',
+                      icon,
+                    )}
+                  />
+                )}
                 <span
                   id={`menu-tab_${route}`}
                   className={classnames(
diff --git a/ui/pages/settings/settings.component.js b/ui/pages/settings/settings.component.js
index 5c6a05497..042702381 100644
--- a/ui/pages/settings/settings.component.js
+++ b/ui/pages/settings/settings.component.js
@@ -28,6 +28,7 @@ import {
 
 import { getSettingsRoutes } from '../../helpers/utils/settings-search';
 import AddNetwork from '../../components/app/add-network/add-network';
+import { Icon, ICON_NAMES } from '../../components/component-library';
 import SettingsTab from './settings-tab';
 import AlertsTab from './alerts-tab';
 import NetworksTab from './networks-tab';

From 0ef1d970616c71ac2ba6115f9b4e9045722387a3 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Thu, 16 Feb 2023 07:26:00 -0600
Subject: [PATCH 15/36] UX: Icons: Stop using fa-address-book (#17761)

* UX: Icons: Stop using fa-address-book

* Remove locale string

* Fix positioning
---
 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/es_419/messages.json                  |  3 ---
 app/_locales/fr/messages.json                      |  3 ---
 app/_locales/hi/messages.json                      |  3 ---
 app/_locales/id/messages.json                      |  3 ---
 app/_locales/it/messages.json                      |  3 ---
 app/_locales/ja/messages.json                      |  3 ---
 app/_locales/ko/messages.json                      |  3 ---
 app/_locales/pt/messages.json                      |  3 ---
 app/_locales/pt_BR/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 ---
 ui/components/app/tab-bar/tab-bar.stories.js       |  2 +-
 ui/helpers/constants/settings.js                   |  2 +-
 .../contact-list-tab/contact-list-tab.component.js | 14 +++++++++++---
 ui/pages/settings/contact-list-tab/index.scss      |  3 +--
 22 files changed, 14 insertions(+), 61 deletions(-)

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 6df762cef..be6cb7785 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -266,9 +266,6 @@
   "address": {
     "message": "Adresse"
   },
-  "addressBookIcon": {
-    "message": "Adressbuchsymbol"
-  },
   "advanced": {
     "message": "Erweitert"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 3563bb92d..df76ccafa 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -266,9 +266,6 @@
   "address": {
     "message": "Διεύθυνση"
   },
-  "addressBookIcon": {
-    "message": "Εικονίδιο βιβλίου διευθύνσεων"
-  },
   "advanced": {
     "message": "Σύνθετες"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 3fe272d2d..12a2abfef 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -266,9 +266,6 @@
   "address": {
     "message": "Address"
   },
-  "addressBookIcon": {
-    "message": "Address book icon"
-  },
   "advanced": {
     "message": "Advanced"
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index c4e93c245..22d7489d6 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -266,9 +266,6 @@
   "address": {
     "message": "Dirección"
   },
-  "addressBookIcon": {
-    "message": "Icono de libreta de direcciones"
-  },
   "advanced": {
     "message": "Avanzado"
   },
diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json
index d5a4b7bb0..774f552c7 100644
--- a/app/_locales/es_419/messages.json
+++ b/app/_locales/es_419/messages.json
@@ -142,9 +142,6 @@
   "address": {
     "message": "Dirección"
   },
-  "addressBookIcon": {
-    "message": "Icono de libreta de direcciones"
-  },
   "advanced": {
     "message": "Avanzado"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index ddaf016b5..909e07417 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -266,9 +266,6 @@
   "address": {
     "message": "Adresse"
   },
-  "addressBookIcon": {
-    "message": "Icône du carnet d’adresses"
-  },
   "advanced": {
     "message": "Paramètres avancés"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 02059b369..256e5b166 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -266,9 +266,6 @@
   "address": {
     "message": "पता"
   },
-  "addressBookIcon": {
-    "message": "पता पुस्तिका आइकन"
-  },
   "advanced": {
     "message": "उन्नत"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index b8a808b9b..65d3d6969 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -266,9 +266,6 @@
   "address": {
     "message": "Alamat"
   },
-  "addressBookIcon": {
-    "message": "Ikon buku alamat"
-  },
   "advanced": {
     "message": "Lanjutan"
   },
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
index 639a2077a..ed5798e4d 100644
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@@ -207,9 +207,6 @@
   "address": {
     "message": "Indirizzo"
   },
-  "addressBookIcon": {
-    "message": "Icona rubrica indirizzo"
-  },
   "advanced": {
     "message": "Avanzate"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 0ca5349e1..797c53435 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -266,9 +266,6 @@
   "address": {
     "message": "アドレス"
   },
-  "addressBookIcon": {
-    "message": "アドレス帳アイコン"
-  },
   "advanced": {
     "message": "高度な設定"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 07774a1c4..9988fc17b 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -266,9 +266,6 @@
   "address": {
     "message": "주소"
   },
-  "addressBookIcon": {
-    "message": "주소록 아이콘"
-  },
   "advanced": {
     "message": "고급"
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 010ce676e..bfe7febde 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -266,9 +266,6 @@
   "address": {
     "message": "Endereço"
   },
-  "addressBookIcon": {
-    "message": "Ícone da agenda de endereços"
-  },
   "advanced": {
     "message": "Avançado"
   },
diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json
index e1e6ef163..ae06eebdc 100644
--- a/app/_locales/pt_BR/messages.json
+++ b/app/_locales/pt_BR/messages.json
@@ -142,9 +142,6 @@
   "address": {
     "message": "Endereço"
   },
-  "addressBookIcon": {
-    "message": "Ícone da agenda de endereços"
-  },
   "advanced": {
     "message": "Avançado"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 2684e3766..2221e078b 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -266,9 +266,6 @@
   "address": {
     "message": "Адрес"
   },
-  "addressBookIcon": {
-    "message": "Значок адресной книги"
-  },
   "advanced": {
     "message": "Дополнительно"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index e9dd06343..ef92e1c31 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -266,9 +266,6 @@
   "address": {
     "message": "Address"
   },
-  "addressBookIcon": {
-    "message": "Icon ng address book"
-  },
   "advanced": {
     "message": "Makabago"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 2ad59c16e..bc120bb11 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -266,9 +266,6 @@
   "address": {
     "message": "Adres"
   },
-  "addressBookIcon": {
-    "message": "Adres defteri simgesi"
-  },
   "advanced": {
     "message": "Gelişmiş"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 5346e57b1..bc03a062d 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -266,9 +266,6 @@
   "address": {
     "message": "Địa chỉ"
   },
-  "addressBookIcon": {
-    "message": "Biểu tượng sổ địa chỉ"
-  },
   "advanced": {
     "message": "Nâng cao"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 3c2d6b162..e7f16c271 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -266,9 +266,6 @@
   "address": {
     "message": "地址"
   },
-  "addressBookIcon": {
-    "message": "地址簿图标"
-  },
   "advanced": {
     "message": "高级"
   },
diff --git a/ui/components/app/tab-bar/tab-bar.stories.js b/ui/components/app/tab-bar/tab-bar.stories.js
index 096a64005..a2f618292 100644
--- a/ui/components/app/tab-bar/tab-bar.stories.js
+++ b/ui/components/app/tab-bar/tab-bar.stories.js
@@ -24,7 +24,7 @@ export default {
         key: 'general',
       },
       {
-        icon: <i className="fa fa-address-book" />,
+        icon: <Icon name={ICON_NAMES.BOOK} />,
         content: 'Contacts',
         key: 'contacts',
       },
diff --git a/ui/helpers/constants/settings.js b/ui/helpers/constants/settings.js
index 1afe88597..bbbfd5812 100644
--- a/ui/helpers/constants/settings.js
+++ b/ui/helpers/constants/settings.js
@@ -145,7 +145,7 @@ export const SETTINGS_CONSTANTS = [
     sectionMessage: (t) => t('contacts'),
     descriptionMessage: (t) => t('contacts'),
     route: CONTACT_LIST_ROUTE,
-    icon: 'fa fa-address-book',
+    icon: ICON_NAMES.BOOK,
   },
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
   {
diff --git a/ui/pages/settings/contact-list-tab/contact-list-tab.component.js b/ui/pages/settings/contact-list-tab/contact-list-tab.component.js
index 4c5080255..c696d00f9 100644
--- a/ui/pages/settings/contact-list-tab/contact-list-tab.component.js
+++ b/ui/pages/settings/contact-list-tab/contact-list-tab.component.js
@@ -11,6 +11,12 @@ import {
   getNumberOfSettingsInSection,
   handleSettingsRefs,
 } from '../../../helpers/utils/settings-search';
+import {
+  Icon,
+  ICON_NAMES,
+  ICON_SIZES,
+} from '../../../components/component-library';
+import { Color } from '../../../helpers/constants/design-system';
 import EditContact from './edit-contact';
 import AddContact from './add-contact';
 import ViewContact from './view-contact';
@@ -72,9 +78,11 @@ export default class ContactListTab extends Component {
     return (
       <div className="address-book__container">
         <div>
-          <i
-            className="fa fa-address-book fa-4x address-book__icon"
-            title={t('addressBookIcon')}
+          <Icon
+            name={ICON_NAMES.BOOK}
+            color={Color.iconMuted}
+            className="address-book__icon"
+            size={ICON_SIZES.XL}
           />
           <h4 className="address-book__title">{t('buildContactList')}</h4>
           <p className="address-book__sub-title">
diff --git a/ui/pages/settings/contact-list-tab/index.scss b/ui/pages/settings/contact-list-tab/index.scss
index dcb09e866..6225ae36f 100644
--- a/ui/pages/settings/contact-list-tab/index.scss
+++ b/ui/pages/settings/contact-list-tab/index.scss
@@ -56,9 +56,8 @@
   }
 
   &__icon {
-    margin-bottom: 16px;
+    margin: 0 auto 16px auto;
     display: block;
-    color: var(--color-icon-muted);
   }
 
   &__title {

From a4f42775b0a1500ba5eb77162591d2f5b44b6a3d Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Thu, 16 Feb 2023 07:26:14 -0600
Subject: [PATCH 16/36] UX: Icons: Remove usage of chevron fa- icons (#17668)

---
 .../files-to-convert.json                     |  4 --
 test/e2e/swaps/swaps-notifications.spec.js    |  2 +-
 .../__snapshots__/app-header.test.js.snap     | 16 ++---
 .../app/asset-list-item/asset-list-item.js    |  9 ++-
 .../app/asset-list-item/asset-list-item.scss  |  6 +-
 .../asset-list-item.stories.js                | 54 ++++++++++++++
 ...ge-container-header.component.test.js.snap | 15 ++--
 ...confirm-page-container-header.component.js |  4 +-
 .../edit-gas-fee-button.js                    |  8 ++-
 .../app/edit-gas-fee-button/index.scss        | 11 +--
 ui/components/app/network-display/index.scss  |  4 --
 .../app/network-display/network-display.js    |  4 +-
 .../__snapshots__/nft-details.test.js.snap    |  5 +-
 ui/components/app/nfts-items/index.scss       |  4 --
 ui/components/app/nfts-items/nfts-items.js    | 10 +--
 ui/components/app/tab-bar/tab-bar.js          |  8 ++-
 .../__snapshots__/token-cell.test.js.snap     |  5 +-
 ...action-activity-log.component.test.js.snap | 20 +++---
 .../app/transaction-activity-log/index.scss   |  1 -
 ...transaction-activity-log-icon.component.js | 34 ++++-----
 .../transaction-activity-log-icon.stories.js  |  6 +-
 ui/components/ui/dropdown/dropdown.js         |  8 ++-
 ui/components/ui/icon/README.mdx              |  3 +-
 ui/components/ui/icon/icon-caret-down.js      | 42 -----------
 ui/components/ui/icon/icon-caret-left.js      | 48 -------------
 ui/components/ui/icon/icon-caret-right.js     | 42 -----------
 ui/components/ui/icon/icon-caret-up.js        | 42 -----------
 ui/components/ui/icon/icon.stories.js         | 18 ++---
 ui/components/ui/popover/index.scss           | 40 -----------
 ui/components/ui/popover/popover.component.js | 72 ++++++++++---------
 .../sender-to-recipient.component.js          |  4 +-
 ui/pages/asset/asset.scss                     |  5 --
 ui/pages/asset/components/asset-breadcrumb.js | 11 ++-
 ui/pages/confirmation/confirmation.js         |  5 +-
 ui/pages/notifications/notifications.js       | 15 ++--
 ui/pages/permissions-connect/index.scss       |  4 --
 .../permissions-connect.component.js          | 11 ++-
 .../add-recipient.component.test.js.snap      | 16 ++---
 .../add-recipient/add-recipient.component.js  |  4 +-
 .../settings-search-list.js                   |  9 +--
 ui/pages/settings/settings.component.js       | 19 +++--
 41 files changed, 242 insertions(+), 406 deletions(-)
 create mode 100644 ui/components/app/asset-list-item/asset-list-item.stories.js
 delete mode 100644 ui/components/ui/icon/icon-caret-down.js
 delete mode 100644 ui/components/ui/icon/icon-caret-left.js
 delete mode 100644 ui/components/ui/icon/icon-caret-right.js
 delete mode 100644 ui/components/ui/icon/icon-caret-up.js

diff --git a/development/ts-migration-dashboard/files-to-convert.json b/development/ts-migration-dashboard/files-to-convert.json
index 4851f87ef..f069ec3ff 100644
--- a/development/ts-migration-dashboard/files-to-convert.json
+++ b/development/ts-migration-dashboard/files-to-convert.json
@@ -885,10 +885,6 @@
   "ui/components/ui/icon-with-fallback/index.js",
   "ui/components/ui/icon/approve-icon.component.js",
   "ui/components/ui/icon/copy-icon.component.js",
-  "ui/components/ui/icon/icon-caret-down.js",
-  "ui/components/ui/icon/icon-caret-left.js",
-  "ui/components/ui/icon/icon-caret-right.js",
-  "ui/components/ui/icon/icon-caret-up.js",
   "ui/components/ui/icon/icon-check.js",
   "ui/components/ui/icon/icon-cog.js",
   "ui/components/ui/icon/icon-connect.js",
diff --git a/test/e2e/swaps/swaps-notifications.spec.js b/test/e2e/swaps/swaps-notifications.spec.js
index c00c6f075..0158b599b 100644
--- a/test/e2e/swaps/swaps-notifications.spec.js
+++ b/test/e2e/swaps/swaps-notifications.spec.js
@@ -140,7 +140,7 @@ describe('Swaps - notifications', function () {
           swapToContractAddress: '0x72c9Fb7ED19D3ce51cea5C56B3e023cd918baaDf',
         });
         await driver.waitForSelector({
-          css: '.popover-header__title',
+          css: '.popover-header',
           text: 'Import token?',
         });
         await driver.clickElement(
diff --git a/ui/components/app/app-header/__snapshots__/app-header.test.js.snap b/ui/components/app/app-header/__snapshots__/app-header.test.js.snap
index 3949b9881..fc03bf83d 100644
--- a/ui/components/app/app-header/__snapshots__/app-header.test.js.snap
+++ b/ui/components/app/app-header/__snapshots__/app-header.test.js.snap
@@ -232,18 +232,10 @@ exports[`App Header should match snapshot 1`] = `
             <div
               class="chip__right-icon"
             >
-              <svg
-                class="network-display__icon"
-                fill="currentColor"
-                height="16"
-                viewBox="0 0 512 512"
-                width="16"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="m399 177c-8-8-22-8-30 0l-113 113-113-113c-8-8-22-8-30 0-8 8-8 22 0 30l128 128c8 8 22 8 30 0l128-128c8-8 8-22 0-30z"
-                />
-              </svg>
+              <div
+                class="box mm-icon mm-icon--size-xs box--flex-direction-row box--color-inherit"
+                style="mask-image: url('./images/icons/arrow-down.svg');"
+              />
             </div>
           </div>
         </div>
diff --git a/ui/components/app/asset-list-item/asset-list-item.js b/ui/components/app/asset-list-item/asset-list-item.js
index deef3bfe5..f65c13545 100644
--- a/ui/components/app/asset-list-item/asset-list-item.js
+++ b/ui/components/app/asset-list-item/asset-list-item.js
@@ -11,11 +11,12 @@ import Button from '../../ui/button';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { startNewDraftTransaction } from '../../../ducks/send';
 import { SEND_ROUTE } from '../../../helpers/constants/routes';
-import { SEVERITIES } from '../../../helpers/constants/design-system';
+import { Color, SEVERITIES } from '../../../helpers/constants/design-system';
 import { INVALID_ASSET_TYPE } from '../../../helpers/constants/error-keys';
 import { EVENT } from '../../../../shared/constants/metametrics';
 import { AssetType } from '../../../../shared/constants/transaction';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
+import { Icon, ICON_NAMES } from '../../component-library';
 
 const AssetListItem = ({
   className,
@@ -138,7 +139,11 @@ const AssetListItem = ({
       rightContent={
         !isERC721 && (
           <>
-            <i className="fas fa-chevron-right asset-list-item__chevron-right" />
+            <Icon
+              name={ICON_NAMES.ARROW_RIGHT}
+              color={Color.iconDefault}
+              className="asset-list-item__chevron-right"
+            />
             {sendTokenButton}
           </>
         )
diff --git a/ui/components/app/asset-list-item/asset-list-item.scss b/ui/components/app/asset-list-item/asset-list-item.scss
index 9e657d4be..1c1702e53 100644
--- a/ui/components/app/asset-list-item/asset-list-item.scss
+++ b/ui/components/app/asset-list-item/asset-list-item.scss
@@ -29,10 +29,6 @@
     overflow: hidden;
   }
 
-  &__chevron-right {
-    color: var(--color-icon-default);
-  }
-
   .list-item__right-content {
     align-self: center;
   }
@@ -72,7 +68,7 @@
       display: inline-block;
     }
 
-    &__chevron-right {
+    &__arrow {
       display: none;
     }
   }
diff --git a/ui/components/app/asset-list-item/asset-list-item.stories.js b/ui/components/app/asset-list-item/asset-list-item.stories.js
new file mode 100644
index 000000000..0fd34e53a
--- /dev/null
+++ b/ui/components/app/asset-list-item/asset-list-item.stories.js
@@ -0,0 +1,54 @@
+import React from 'react';
+import AssetListItem from '.';
+
+export default {
+  title: 'Components/App/AssetListItem',
+  argTypes: {
+    className: {
+      control: 'text',
+    },
+    iconClassName: {
+      control: 'text',
+    },
+    onClick: {
+      action: 'onClick',
+    },
+    tokenAddress: {
+      control: 'text',
+    },
+    tokenSymbol: {
+      control: 'text',
+    },
+    tokenDecimals: {
+      control: 'number',
+    },
+    tokenImage: {
+      control: 'text',
+    },
+    warning: {
+      control: 'text',
+    },
+    primary: {
+      control: 'text',
+    },
+    secondary: {
+      control: 'text',
+    },
+    identiconBorder: {
+      control: 'boolean',
+    },
+    isERC721: {
+      control: 'boolean',
+    },
+  },
+  args: {
+    tokenAddress: '0x2170ed0880ac9a755fd29b2688956bd959f933f8',
+    tokenSymbol: 'ETH',
+    tokenImage: './images/eth_logo.svg',
+    identiconBorder: true,
+  },
+};
+
+export const DefaultStory = (args) => <AssetListItem {...args} />;
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/components/app/confirm-page-container/confirm-page-container-header/__snapshots__/confirm-page-container-header.component.test.js.snap b/ui/components/app/confirm-page-container/confirm-page-container-header/__snapshots__/confirm-page-container-header.component.test.js.snap
index 80aeb929f..e7fb55a39 100644
--- a/ui/components/app/confirm-page-container/confirm-page-container-header/__snapshots__/confirm-page-container-header.component.test.js.snap
+++ b/ui/components/app/confirm-page-container/confirm-page-container-header/__snapshots__/confirm-page-container-header.component.test.js.snap
@@ -13,17 +13,10 @@ exports[`Confirm Detail Row Component should match snapshot 1`] = `
         class="confirm-page-container-header__back-button-container"
         style="visibility: hidden;"
       >
-        <svg
-          fill="currentColor"
-          height="24"
-          viewBox="0 0 512 512"
-          width="24"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="m335 113c8 8 8 22 0 30l-113 113 113 113c8 8 8 22 0 30-8 8-22 8-30 0l-128-128c-8-8-8-22 0-30l128-128c8-8 22-8 30 0z"
-          />
-        </svg>
+        <div
+          class="box mm-icon mm-icon--size-md box--flex-direction-row box--color-inherit"
+          style="mask-image: url('./images/icons/arrow-left.svg');"
+        />
         <span
           class="confirm-page-container-header__back-button"
           data-testid="confirm-page-back-edit-button"
diff --git a/ui/components/app/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.js b/ui/components/app/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.js
index 40a9f3519..f4574b468 100644
--- a/ui/components/app/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.js
+++ b/ui/components/app/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.js
@@ -7,10 +7,10 @@ import {
 import { getEnvironmentType } from '../../../../../app/scripts/lib/util';
 import NetworkDisplay from '../../network-display';
 import Identicon from '../../../ui/identicon';
-import IconCaretLeft from '../../../ui/icon/icon-caret-left';
 import { shortenAddress } from '../../../../helpers/utils/util';
 import AccountMismatchWarning from '../../../ui/account-mismatch-warning/account-mismatch-warning.component';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
+import { Icon, ICON_NAMES } from '../../../component-library';
 
 export default function ConfirmPageContainerHeader({
   onEdit,
@@ -54,7 +54,7 @@ export default function ConfirmPageContainerHeader({
               visibility: showEdit ? 'initial' : 'hidden',
             }}
           >
-            <IconCaretLeft />
+            <Icon name={ICON_NAMES.ARROW_LEFT} />
             <span
               data-testid="confirm-page-back-edit-button"
               className="confirm-page-container-header__back-button"
diff --git a/ui/components/app/edit-gas-fee-button/edit-gas-fee-button.js b/ui/components/app/edit-gas-fee-button/edit-gas-fee-button.js
index 6270eaec4..e7b16d903 100644
--- a/ui/components/app/edit-gas-fee-button/edit-gas-fee-button.js
+++ b/ui/components/app/edit-gas-fee-button/edit-gas-fee-button.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 
 import { EditGasModes, PriorityLevels } from '../../../../shared/constants/gas';
 import {
+  Color,
   TextColor,
   TypographyVariant,
 } from '../../../helpers/constants/design-system';
@@ -13,6 +14,7 @@ import { useTransactionEventFragment } from '../../../hooks/useTransactionEventF
 import { useTransactionModalContext } from '../../../contexts/transaction-modal';
 import InfoTooltip from '../../ui/info-tooltip/info-tooltip';
 import Typography from '../../ui/typography/typography';
+import { Icon, ICON_NAMES, ICON_SIZES } from '../../component-library';
 
 export default function EditGasFeeButton({ userAcknowledgedGasMissing }) {
   const t = useI18nContext();
@@ -71,7 +73,11 @@ export default function EditGasFeeButton({ userAcknowledgedGasMissing }) {
           </span>
         )}
         <span className="edit-gas-fee-button__label">{t(title)}</span>
-        <i className="fas fa-chevron-right asset-list-item__chevron-right" />
+        <Icon
+          name={ICON_NAMES.ARROW_RIGHT}
+          color={Color.primaryDefault}
+          size={ICON_SIZES.XS}
+        />
       </button>
       {estimateUsed === 'custom' && (
         <button onClick={openAdvancedGasFeeModal}>{t('edit')}</button>
diff --git a/ui/components/app/edit-gas-fee-button/index.scss b/ui/components/app/edit-gas-fee-button/index.scss
index 448eab674..e2ca5e6d3 100644
--- a/ui/components/app/edit-gas-fee-button/index.scss
+++ b/ui/components/app/edit-gas-fee-button/index.scss
@@ -7,7 +7,7 @@
     @include H7;
 
     display: flex;
-    align-items: baseline;
+    align-items: center;
     color: var(--color-primary-default);
     background: transparent;
     border: 0;
@@ -15,19 +15,14 @@
     white-space: pre;
   }
 
-  i {
-    color: var(--color-primary-default);
-    margin-right: 2px;
-  }
-
   &__icon {
     font-size: 16px;
-    margin-right: 4px;
+    margin-right: 2px;
   }
 
   &__label {
     font-size: 12px;
-    margin-right: 8px;
+    margin-right: 4px;
   }
 
   .info-tooltip {
diff --git a/ui/components/app/network-display/index.scss b/ui/components/app/network-display/index.scss
index 1ca9b410a..16755aa5f 100644
--- a/ui/components/app/network-display/index.scss
+++ b/ui/components/app/network-display/index.scss
@@ -30,10 +30,6 @@
     margin-right: 4px;
   }
 
-  &__icon {
-    display: block;
-  }
-
   &--clickable {
     cursor: pointer;
   }
diff --git a/ui/components/app/network-display/network-display.js b/ui/components/app/network-display/network-display.js
index 669035f5e..2b7e53aec 100644
--- a/ui/components/app/network-display/network-display.js
+++ b/ui/components/app/network-display/network-display.js
@@ -16,9 +16,9 @@ import {
   TypographyVariant,
 } from '../../../helpers/constants/design-system';
 import Chip from '../../ui/chip/chip';
-import IconCaretDown from '../../ui/icon/icon-caret-down';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { isNetworkLoading } from '../../../selectors';
+import { Icon, ICON_NAMES, ICON_SIZES } from '../../component-library';
 
 export default function NetworkDisplay({
   indicatorSize,
@@ -68,7 +68,7 @@ export default function NetworkDisplay({
       }
       rightIcon={
         onClick ? (
-          <IconCaretDown size={16} className="network-display__icon" />
+          <Icon name={ICON_NAMES.ARROW_DOWN} size={ICON_SIZES.XS} />
         ) : null
       }
       label={
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 562938ccf..892e798e0 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
@@ -8,9 +8,10 @@ exports[`Collectible Details should match minimal props and state snapshot 1`] =
     <button
       class="asset-breadcrumb"
     >
-      <i
-        class="fas fa-chevron-left asset-breadcrumb__chevron"
+      <div
+        class="box mm-icon mm-icon--size-xs box--margin-inline-end-3 box--flex-direction-row box--color-inherit"
         data-testid="asset__back"
+        style="mask-image: url('./images/icons/arrow-left.svg');"
       />
       <span>
         Test Account
diff --git a/ui/components/app/nfts-items/index.scss b/ui/components/app/nfts-items/index.scss
index 2254e5925..fdf1a7f83 100644
--- a/ui/components/app/nfts-items/index.scss
+++ b/ui/components/app/nfts-items/index.scss
@@ -27,10 +27,6 @@
       color: var(--color-overlay-inverse);
       text-align: center;
     }
-
-    &__icon-chevron {
-      color: var(--color-icon-default);
-    }
   }
 
   &__item-wrapper {
diff --git a/ui/components/app/nfts-items/nfts-items.js b/ui/components/app/nfts-items/nfts-items.js
index dbe2ab454..28cf58628 100644
--- a/ui/components/app/nfts-items/nfts-items.js
+++ b/ui/components/app/nfts-items/nfts-items.js
@@ -31,6 +31,7 @@ import { usePrevious } from '../../../hooks/usePrevious';
 import { getCollectiblesDropdownState } from '../../../ducks/metamask/metamask';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import CollectibleDefaultImage from '../nft-default-image';
+import { Icon, ICON_NAMES } from '../../component-library';
 
 const width =
   getEnvironmentType() === ENVIRONMENT_TYPE_POPUP
@@ -163,10 +164,11 @@ export default function CollectiblesItems({
               </Typography>
             </Box>
             <Box alignItems={AlignItems.flexEnd}>
-              <i
-                className={`collectibles-items__collection__icon-chevron fa fa-chevron-${
-                  isExpanded ? 'down' : 'right'
-                }`}
+              <Icon
+                name={
+                  isExpanded ? ICON_NAMES.ARROW_DOWN : ICON_NAMES.ARROW_RIGHT
+                }
+                color={Color.iconDefault}
               />
             </Box>
           </Box>
diff --git a/ui/components/app/tab-bar/tab-bar.js b/ui/components/app/tab-bar/tab-bar.js
index 3fe2babab..c76fba371 100644
--- a/ui/components/app/tab-bar/tab-bar.js
+++ b/ui/components/app/tab-bar/tab-bar.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 
-import IconCaretRight from '../../ui/icon/icon-caret-right';
+import { Icon, ICON_NAMES, ICON_SIZES } from '../../component-library';
 
 const TabBar = (props) => {
   const { tabs = [], onSelect, isActive } = props;
@@ -21,7 +21,11 @@ const TabBar = (props) => {
             <div className="tab-bar__tab__content__icon">{icon}</div>
             <div className="tab-bar__tab__content__title">{content}</div>
           </div>
-          <IconCaretRight className="tab-bar__tab__caret" />
+          <Icon
+            name={ICON_NAMES.ARROW_RIGHT}
+            size={ICON_SIZES.SM}
+            className="tab-bar__tab__caret"
+          />
         </button>
       ))}
     </div>
diff --git a/ui/components/app/token-cell/__snapshots__/token-cell.test.js.snap b/ui/components/app/token-cell/__snapshots__/token-cell.test.js.snap
index efea9cda4..ee1ea8df5 100644
--- a/ui/components/app/token-cell/__snapshots__/token-cell.test.js.snap
+++ b/ui/components/app/token-cell/__snapshots__/token-cell.test.js.snap
@@ -80,8 +80,9 @@ exports[`Token Cell should match snapshot 1`] = `
     <div
       class="list-item__right-content"
     >
-      <i
-        class="fas fa-chevron-right asset-list-item__chevron-right"
+      <div
+        class="box asset-list-item__chevron-right mm-icon mm-icon--size-md box--flex-direction-row box--color-icon-default"
+        style="mask-image: url('./images/icons/arrow-right.svg');"
       />
       <a
         class="button btn-link asset-list-item__send-token-button"
diff --git a/ui/components/app/transaction-activity-log/__snapshots__/transaction-activity-log.component.test.js.snap b/ui/components/app/transaction-activity-log/__snapshots__/transaction-activity-log.component.test.js.snap
index cc5eeea68..8c0473f8b 100644
--- a/ui/components/app/transaction-activity-log/__snapshots__/transaction-activity-log.component.test.js.snap
+++ b/ui/components/app/transaction-activity-log/__snapshots__/transaction-activity-log.component.test.js.snap
@@ -19,8 +19,9 @@ exports[`TransactionActivityLog Component should match snapshot 1`] = `
         <div
           class="transaction-activity-log-icon transaction-activity-log__activity-icon"
         >
-          <i
-            class="fa transaction-activity-log-icon__icon fa-plus"
+          <div
+            class="box mm-icon mm-icon--size-sm box--flex-direction-row box--color-icon-default"
+            style="mask-image: url('./images/icons/add.svg');"
           />
         </div>
         <div
@@ -40,8 +41,9 @@ exports[`TransactionActivityLog Component should match snapshot 1`] = `
         <div
           class="transaction-activity-log-icon transaction-activity-log__activity-icon"
         >
-          <i
-            class="fa transaction-activity-log-icon__icon fa-arrow-up"
+          <div
+            class="box mm-icon mm-icon--size-sm box--flex-direction-row box--color-icon-default"
+            style="mask-image: url('./images/icons/arrow-up.svg');"
           />
         </div>
         <div
@@ -61,8 +63,9 @@ exports[`TransactionActivityLog Component should match snapshot 1`] = `
         <div
           class="transaction-activity-log-icon transaction-activity-log__activity-icon"
         >
-          <i
-            class="fa transaction-activity-log-icon__icon fa-retweet"
+          <div
+            class="box mm-icon mm-icon--size-sm box--flex-direction-row box--color-icon-default"
+            style="mask-image: url('./images/icons/programming-arrows.svg');"
           />
         </div>
         <div
@@ -82,8 +85,9 @@ exports[`TransactionActivityLog Component should match snapshot 1`] = `
         <div
           class="transaction-activity-log-icon transaction-activity-log__activity-icon"
         >
-          <i
-            class="fa transaction-activity-log-icon__icon fa-check"
+          <div
+            class="box mm-icon mm-icon--size-sm box--flex-direction-row box--color-icon-default"
+            style="mask-image: url('./images/icons/check.svg');"
           />
         </div>
         <div
diff --git a/ui/components/app/transaction-activity-log/index.scss b/ui/components/app/transaction-activity-log/index.scss
index e5544829c..314a56b88 100644
--- a/ui/components/app/transaction-activity-log/index.scss
+++ b/ui/components/app/transaction-activity-log/index.scss
@@ -45,7 +45,6 @@
     height: 15px;
     margin-right: 6px;
     border-radius: 50%;
-    background: var(--color-icon-default);
     flex: 0 0 auto;
     display: flex;
     justify-content: center;
diff --git a/ui/components/app/transaction-activity-log/transaction-activity-log-icon/transaction-activity-log-icon.component.js b/ui/components/app/transaction-activity-log/transaction-activity-log-icon/transaction-activity-log-icon.component.js
index 891562805..23a79ee7c 100644
--- a/ui/components/app/transaction-activity-log/transaction-activity-log-icon/transaction-activity-log-icon.component.js
+++ b/ui/components/app/transaction-activity-log/transaction-activity-log-icon/transaction-activity-log-icon.component.js
@@ -12,16 +12,18 @@ import {
   TRANSACTION_CANCEL_ATTEMPTED_EVENT,
   TRANSACTION_CANCEL_SUCCESS_EVENT,
 } from '../transaction-activity-log.constants';
+import { Icon, ICON_NAMES, ICON_SIZES } from '../../../component-library';
+import { Color } from '../../../../helpers/constants/design-system';
 
-export const imageHash = {
-  [TRANSACTION_CREATED_EVENT]: 'fa-plus',
-  [TRANSACTION_SUBMITTED_EVENT]: 'fa-arrow-up',
-  [TRANSACTION_RESUBMITTED_EVENT]: 'fa-retweet',
-  [TRANSACTION_CONFIRMED_EVENT]: 'fa-check',
-  [TRANSACTION_DROPPED_EVENT]: 'fa-times',
-  [TRANSACTION_ERRORED_EVENT]: 'fa-exclamation',
-  [TRANSACTION_CANCEL_ATTEMPTED_EVENT]: 'fa-times',
-  [TRANSACTION_CANCEL_SUCCESS_EVENT]: 'fa-times',
+export const ACTIVITY_ICONS = {
+  [TRANSACTION_CREATED_EVENT]: ICON_NAMES.ADD,
+  [TRANSACTION_SUBMITTED_EVENT]: ICON_NAMES.ARROW_UP,
+  [TRANSACTION_RESUBMITTED_EVENT]: ICON_NAMES.PROGRAMMING_ARROWS,
+  [TRANSACTION_CONFIRMED_EVENT]: ICON_NAMES.CHECK,
+  [TRANSACTION_DROPPED_EVENT]: ICON_NAMES.CLOSE,
+  [TRANSACTION_ERRORED_EVENT]: ICON_NAMES.DANGER,
+  [TRANSACTION_CANCEL_ATTEMPTED_EVENT]: ICON_NAMES.CLOSE,
+  [TRANSACTION_CANCEL_SUCCESS_EVENT]: ICON_NAMES.CLOSE,
 };
 
 export default class TransactionActivityLogIcon extends PureComponent {
@@ -31,23 +33,17 @@ export default class TransactionActivityLogIcon extends PureComponent {
 
   static propTypes = {
     className: PropTypes.string,
-    eventKey: PropTypes.oneOf(Object.keys(imageHash)),
+    eventKey: PropTypes.oneOf(Object.keys(ACTIVITY_ICONS)),
   };
 
   render() {
     const { className, eventKey } = this.props;
-    const iconClassName = imageHash[eventKey];
+    const icon = ACTIVITY_ICONS[eventKey];
 
     return (
       <div className={classnames('transaction-activity-log-icon', className)}>
-        {iconClassName ? (
-          <i
-            className={classnames(
-              'fa',
-              'transaction-activity-log-icon__icon',
-              iconClassName,
-            )}
-          />
+        {icon ? (
+          <Icon name={icon} color={Color.iconDefault} size={ICON_SIZES.SM} />
         ) : null}
       </div>
     );
diff --git a/ui/components/app/transaction-activity-log/transaction-activity-log-icon/transaction-activity-log-icon.stories.js b/ui/components/app/transaction-activity-log/transaction-activity-log-icon/transaction-activity-log-icon.stories.js
index 507652d54..b23e82f47 100644
--- a/ui/components/app/transaction-activity-log/transaction-activity-log-icon/transaction-activity-log-icon.stories.js
+++ b/ui/components/app/transaction-activity-log/transaction-activity-log-icon/transaction-activity-log-icon.stories.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { imageHash } from './transaction-activity-log-icon.component';
+import { ACTIVITY_ICONS } from './transaction-activity-log-icon.component';
 import TransactionActivityLogIcon from '.';
 
 export default {
@@ -11,11 +11,11 @@ export default {
     },
     eventKey: {
       control: 'select',
-      options: Object.keys(imageHash),
+      options: Object.keys(ACTIVITY_ICONS),
     },
   },
   args: {
-    eventKey: Object.keys(imageHash)[0],
+    eventKey: Object.keys(ACTIVITY_ICONS)[0],
   },
 };
 
diff --git a/ui/components/ui/dropdown/dropdown.js b/ui/components/ui/dropdown/dropdown.js
index 8bfde46ff..5cba69ad9 100644
--- a/ui/components/ui/dropdown/dropdown.js
+++ b/ui/components/ui/dropdown/dropdown.js
@@ -1,7 +1,7 @@
 import React, { useCallback } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import IconCaretDown from '../icon/icon-caret-down';
+import { Icon, ICON_NAMES, ICON_SIZES } from '../../component-library';
 
 const Dropdown = ({
   className,
@@ -41,7 +41,11 @@ const Dropdown = ({
           );
         })}
       </select>
-      <IconCaretDown size={16} className="dropdown__icon-caret-down" />
+      <Icon
+        name={ICON_NAMES.ARROW_DOWN}
+        size={ICON_SIZES.SM}
+        className="dropdown__icon-caret-down"
+      />
     </div>
   );
 };
diff --git a/ui/components/ui/icon/README.mdx b/ui/components/ui/icon/README.mdx
index 7b8ab0711..eb0254dc0 100644
--- a/ui/components/ui/icon/README.mdx
+++ b/ui/components/ui/icon/README.mdx
@@ -1,6 +1,5 @@
 import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 
-import IconCaretLeft from './icon-caret-left.js';
 import Approve from './approve-icon.component';
 import InfoIcon from './info-icon.component';
 import InfoIconInverted from './info-icon-inverted.component';
@@ -20,7 +19,7 @@ A range of SVG icon components
 
 ## Props
 
-<ArgsTable of={IconCaretLeft} />
+<ArgsTable of={SunCheck} />
 
 ## Usage
 
diff --git a/ui/components/ui/icon/icon-caret-down.js b/ui/components/ui/icon/icon-caret-down.js
deleted file mode 100644
index 64b40a31a..000000000
--- a/ui/components/ui/icon/icon-caret-down.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-const IconCaretDown = ({
-  size = 24,
-  color = 'currentColor',
-  ariaLabel,
-  className,
-}) => (
-  <svg
-    width={size}
-    height={size}
-    fill={color}
-    className={className}
-    aria-label={ariaLabel}
-    xmlns="http://www.w3.org/2000/svg"
-    viewBox="0 0 512 512"
-  >
-    <path d="m399 177c-8-8-22-8-30 0l-113 113-113-113c-8-8-22-8-30 0-8 8-8 22 0 30l128 128c8 8 22 8 30 0l128-128c8-8 8-22 0-30z" />
-  </svg>
-);
-
-IconCaretDown.propTypes = {
-  /**
-   * The size of the Icon follows an 8px grid 2 = 16px, 3 = 24px etc
-   */
-  size: PropTypes.number,
-  /**
-   * The color of the icon accepts design token css variables
-   */
-  color: PropTypes.string,
-  /**
-   * An additional className to assign the Icon
-   */
-  className: PropTypes.string,
-  /**
-   * The aria-label of the icon for accessibility purposes
-   */
-  ariaLabel: PropTypes.string,
-};
-
-export default IconCaretDown;
diff --git a/ui/components/ui/icon/icon-caret-left.js b/ui/components/ui/icon/icon-caret-left.js
deleted file mode 100644
index 4fe22144e..000000000
--- a/ui/components/ui/icon/icon-caret-left.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-const IconCaretLeft = ({
-  size = 24,
-  color = 'currentColor',
-  ariaLabel,
-  className,
-  onClick,
-}) => (
-  <svg
-    width={size}
-    height={size}
-    fill={color}
-    className={className}
-    aria-label={ariaLabel}
-    onClick={onClick}
-    xmlns="http://www.w3.org/2000/svg"
-    viewBox="0 0 512 512"
-  >
-    <path d="m335 113c8 8 8 22 0 30l-113 113 113 113c8 8 8 22 0 30-8 8-22 8-30 0l-128-128c-8-8-8-22 0-30l128-128c8-8 22-8 30 0z" />
-  </svg>
-);
-
-IconCaretLeft.propTypes = {
-  /**
-   * The size of the Icon follows an 8px grid 2 = 16px, 3 = 24px etc
-   */
-  size: PropTypes.number,
-  /**
-   * The color of the icon accepts design token css variables
-   */
-  color: PropTypes.string,
-  /**
-   * An additional className to assign the Icon
-   */
-  className: PropTypes.string,
-  /**
-   * The onClick handler
-   */
-  onClick: PropTypes.func,
-  /**
-   * The aria-label of the icon for accessibility purposes
-   */
-  ariaLabel: PropTypes.string,
-};
-
-export default IconCaretLeft;
diff --git a/ui/components/ui/icon/icon-caret-right.js b/ui/components/ui/icon/icon-caret-right.js
deleted file mode 100644
index 890f89171..000000000
--- a/ui/components/ui/icon/icon-caret-right.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-const IconCaretRight = ({
-  size = 24,
-  color = 'currentColor',
-  ariaLabel,
-  className,
-}) => (
-  <svg
-    width={size}
-    height={size}
-    fill={color}
-    className={className}
-    aria-label={ariaLabel}
-    xmlns="http://www.w3.org/2000/svg"
-    viewBox="0 0 512 512"
-  >
-    <path d="m177 113c-8 8-8 22 0 30l113 113-113 113c-8 8-8 22 0 30 8 8 22 8 30 0l128-128c8-8 8-22 0-30l-128-128c-8-8-22-8-30 0z" />
-  </svg>
-);
-
-IconCaretRight.propTypes = {
-  /**
-   * The size of the Icon follows an 8px grid 2 = 16px, 3 = 24px etc
-   */
-  size: PropTypes.number,
-  /**
-   * The color of the icon accepts design token css variables
-   */
-  color: PropTypes.string,
-  /**
-   * An additional className to assign the Icon
-   */
-  className: PropTypes.string,
-  /**
-   * The aria-label of the icon for accessibility purposes
-   */
-  ariaLabel: PropTypes.string,
-};
-
-export default IconCaretRight;
diff --git a/ui/components/ui/icon/icon-caret-up.js b/ui/components/ui/icon/icon-caret-up.js
deleted file mode 100644
index 8e455e638..000000000
--- a/ui/components/ui/icon/icon-caret-up.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-const IconCaretUp = ({
-  size = 24,
-  color = 'currentColor',
-  ariaLabel,
-  className,
-}) => (
-  <svg
-    width={size}
-    height={size}
-    fill={color}
-    className={className}
-    aria-label={ariaLabel}
-    xmlns="http://www.w3.org/2000/svg"
-    viewBox="0 0 512 512"
-  >
-    <path d="m399 335c-8 8-22 8-30 0l-113-113-113 113c-8 8-22 8-30 0-8-8-8-22 0-30l128-128c8-8 22-8 30 0l128 128c8 8 8 22 0 30z" />
-  </svg>
-);
-
-IconCaretUp.propTypes = {
-  /**
-   * The size of the Icon follows an 8px grid 2 = 16px, 3 = 24px etc
-   */
-  size: PropTypes.number,
-  /**
-   * The color of the icon accepts design token css variables
-   */
-  color: PropTypes.string,
-  /**
-   * An additional className to assign the Icon
-   */
-  className: PropTypes.string,
-  /**
-   * The aria-label of the icon for accessibility purposes
-   */
-  ariaLabel: PropTypes.string,
-};
-
-export default IconCaretUp;
diff --git a/ui/components/ui/icon/icon.stories.js b/ui/components/ui/icon/icon.stories.js
index 79ff63b2e..fa184c310 100644
--- a/ui/components/ui/icon/icon.stories.js
+++ b/ui/components/ui/icon/icon.stories.js
@@ -22,10 +22,6 @@ import SendIcon from './send-icon.component';
 import Sign from './sign-icon.component';
 import SunCheck from './sun-check-icon.component';
 import Swap from './swap-icon-for-list.component';
-import IconCaretLeft from './icon-caret-left';
-import IconCaretRight from './icon-caret-right';
-import IconCaretDown from './icon-caret-down';
-import IconCaretUp from './icon-caret-up';
 import IconCheck from './icon-check';
 import IconCog from './icon-cog';
 import IconConnect from './icon-connect';
@@ -116,10 +112,6 @@ export const DefaultStory = (args) => (
           gridTemplateColumns: 'repeat(auto-fill, 176px)',
         }}
       >
-        <IconItem Component={<IconCaretLeft {...args} />} />
-        <IconItem Component={<IconCaretRight {...args} />} />
-        <IconItem Component={<IconCaretDown {...args} />} />
-        <IconItem Component={<IconCaretUp {...args} />} />
         <IconItem Component={<IconCheck {...args} />} />
         <IconItem Component={<IconPlus {...args} />} />
         <IconItem Component={<IconImport {...args} />} />
@@ -174,9 +166,9 @@ DefaultStory.args = {
 
 export const Size = (args) => (
   <div>
-    <IconCaretLeft size={16 || args.size} />
-    <IconCaretLeft size={24 || args.size} />
-    <IconCaretLeft size={32 || args.size} />
+    <SunCheck size={16 || args.size} />
+    <SunCheck size={24 || args.size} />
+    <SunCheck size={32 || args.size} />
   </div>
 );
 
@@ -187,12 +179,12 @@ Size.args = {
 export const Color = (args) => (
   <>
     {Object.values(validColors).map((color) => (
-      <IconCaretLeft {...args} color={args.color || color} key={color} />
+      <SunCheck {...args} color={args.color || color} key={color} />
     ))}
   </>
 );
 
-export const AriaLabel = (args) => <IconCaretLeft {...args} />;
+export const AriaLabel = (args) => <SunCheck {...args} />;
 
 AriaLabel.args = {
   ariaLabel: 'back',
diff --git a/ui/components/ui/popover/index.scss b/ui/components/ui/popover/index.scss
index 99077d5df..acb22a510 100644
--- a/ui/components/ui/popover/index.scss
+++ b/ui/components/ui/popover/index.scss
@@ -22,46 +22,6 @@
 
   &-header {
     position: relative;
-
-    &__title {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-
-      @include H4;
-
-      font-weight: bold;
-      padding-bottom: 8px;
-
-      h2 {
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-
-        button {
-          margin-right: 24px;
-        }
-      }
-
-      &.center {
-        justify-content: center;
-      }
-    }
-
-    &__subtitle {
-      @include H6;
-    }
-
-    &__button {
-      background: none;
-      font-size: inherit;
-      padding: 0;
-      color: var(--color-icon-default);
-    }
-
-    i {
-      cursor: pointer;
-    }
   }
 
   &-bg {
diff --git a/ui/components/ui/popover/popover.component.js b/ui/components/ui/popover/popover.component.js
index 119b5f40d..11a333aec 100644
--- a/ui/components/ui/popover/popover.component.js
+++ b/ui/components/ui/popover/popover.component.js
@@ -9,7 +9,12 @@ import {
   BackgroundColor,
   FLEX_DIRECTION,
   JustifyContent,
+  Color,
+  DISPLAY,
+  TextVariant,
+  Size,
 } from '../../../helpers/constants/design-system';
+import { ButtonIcon, Text, ICON_NAMES } from '../../component-library';
 
 const defaultHeaderProps = {
   padding: [6, 4, 4],
@@ -53,43 +58,44 @@ const Popover = ({
 }) => {
   const t = useI18nContext();
   const showHeader = title || onBack || subtitle || onClose;
-  const Header = () => {
-    return (
+  const Header = () => (
+    <Box
+      {...{ ...defaultHeaderProps, ...headerProps }}
+      className="popover-header"
+    >
       <Box
-        {...{ ...defaultHeaderProps, ...headerProps }}
-        className="popover-header"
+        display={DISPLAY.FLEX}
+        alignItems={AlignItems.center}
+        justifyContent={
+          centerTitle ? JustifyContent.center : JustifyContent.spaceBetween
+        }
+        marginBottom={2}
       >
-        <div
-          className={classnames(
-            'popover-header__title',
-            centerTitle ? 'center' : '',
-          )}
-        >
-          <h2 title="popover">
-            {onBack ? (
-              <button
-                className="fas fa-chevron-left popover-header__button"
-                title={t('back')}
-                onClick={onBack}
-              />
-            ) : null}
-            {title}
-          </h2>
-          {onClose ? (
-            <button
-              className="fas fa-times popover-header__button"
-              title={t('close')}
-              data-testid="popover-close"
-              onClick={onClose}
-            />
-          ) : null}
-        </div>
-        {subtitle ? (
-          <p className="popover-header__subtitle">{subtitle}</p>
+        {onBack ? (
+          <ButtonIcon
+            iconName={ICON_NAMES.ARROW_LEFT}
+            ariaLabel={t('back')}
+            onClick={onBack}
+            color={Color.iconDefault}
+            size={Size.SM}
+          />
+        ) : null}
+        <Text ellipsis variant={TextVariant.headingSm}>
+          {title}
+        </Text>
+        {onClose ? (
+          <ButtonIcon
+            iconName={ICON_NAMES.CLOSE}
+            ariaLabel={t('close')}
+            data-testid="popover-close"
+            onClick={onClose}
+            size={Size.SM}
+          />
         ) : null}
       </Box>
-    );
-  };
+      {subtitle ? <Text variant={TextVariant.bodySm}>{subtitle}</Text> : null}
+    </Box>
+  );
 
   return (
     <div className="popover-container">
diff --git a/ui/components/ui/sender-to-recipient/sender-to-recipient.component.js b/ui/components/ui/sender-to-recipient/sender-to-recipient.component.js
index 3254c9299..446f47c5b 100644
--- a/ui/components/ui/sender-to-recipient/sender-to-recipient.component.js
+++ b/ui/components/ui/sender-to-recipient/sender-to-recipient.component.js
@@ -3,13 +3,13 @@ import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import copyToClipboard from 'copy-to-clipboard';
 import Tooltip from '../tooltip';
-import IconCaretRight from '../icon/icon-caret-right';
 import Identicon from '../identicon';
 import { shortenAddress } from '../../../helpers/utils/util';
 import AccountMismatchWarning from '../account-mismatch-warning/account-mismatch-warning.component';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { toChecksumHexAddress } from '../../../../shared/modules/hexstring-utils';
 import NicknamePopovers from '../../app/modals/nickname-popovers';
+import { Icon, ICON_NAMES } from '../../component-library';
 import {
   DEFAULT_VARIANT,
   CARDS_VARIANT,
@@ -199,7 +199,7 @@ function Arrow({ variant }) {
     </div>
   ) : (
     <div className="sender-to-recipient__arrow-container">
-      <IconCaretRight />
+      <Icon name={ICON_NAMES.ARROW_RIGHT} />
     </div>
   );
 }
diff --git a/ui/pages/asset/asset.scss b/ui/pages/asset/asset.scss
index 0b1b8543e..4365547e3 100644
--- a/ui/pages/asset/asset.scss
+++ b/ui/pages/asset/asset.scss
@@ -22,11 +22,6 @@
   color: var(--color-text-default);
   background-color: inherit;
 
-  &__chevron {
-    font-size: $font-size-paragraph;
-    padding: 0 10px 0 2px;
-  }
-
   &__asset {
     font-weight: bold;
   }
diff --git a/ui/pages/asset/components/asset-breadcrumb.js b/ui/pages/asset/components/asset-breadcrumb.js
index ac11054c3..d66c20d33 100644
--- a/ui/pages/asset/components/asset-breadcrumb.js
+++ b/ui/pages/asset/components/asset-breadcrumb.js
@@ -1,12 +1,19 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import {
+  Icon,
+  ICON_NAMES,
+  ICON_SIZES,
+} from '../../../components/component-library';
 
 const AssetBreadcrumb = ({ accountName, assetName, onBack }) => {
   return (
     <button className="asset-breadcrumb" onClick={onBack}>
-      <i
-        className="fas fa-chevron-left asset-breadcrumb__chevron"
+      <Icon
+        name={ICON_NAMES.ARROW_LEFT}
         data-testid="asset__back"
+        marginInlineEnd={3}
+        size={ICON_SIZES.XS}
       />
       <span>{accountName}</span>
       &nbsp;/&nbsp;
diff --git a/ui/pages/confirmation/confirmation.js b/ui/pages/confirmation/confirmation.js
index 37878e301..60b305f72 100644
--- a/ui/pages/confirmation/confirmation.js
+++ b/ui/pages/confirmation/confirmation.js
@@ -33,6 +33,7 @@ import {
 import NetworkDisplay from '../../components/app/network-display/network-display';
 import Callout from '../../components/ui/callout';
 import SiteOrigin from '../../components/ui/site-origin';
+import { Icon, ICON_NAMES } from '../../components/component-library';
 import ConfirmationFooter from './components/confirmation-footer';
 import {
   getTemplateValues,
@@ -283,7 +284,7 @@ export default function ConfirmationPage({
                 setCurrentPendingConfirmation(currentPendingConfirmation - 1)
               }
             >
-              <i className="fas fa-chevron-left" />
+              <Icon name={ICON_NAMES.ARROW_LEFT} />
             </button>
           )}
           <button
@@ -295,7 +296,7 @@ export default function ConfirmationPage({
               setCurrentPendingConfirmation(currentPendingConfirmation + 1)
             }
           >
-            <i className="fas fa-chevron-right" />
+            <Icon name={ICON_NAMES.ARROW_RIGHT} />
           </button>
         </div>
       )}
diff --git a/ui/pages/notifications/notifications.js b/ui/pages/notifications/notifications.js
index 9e4fd64b8..75768cf3a 100644
--- a/ui/pages/notifications/notifications.js
+++ b/ui/pages/notifications/notifications.js
@@ -14,9 +14,14 @@ import {
   deleteExpiredNotifications,
   markNotificationsAsRead,
 } from '../../store/actions';
-import IconCaretLeft from '../../components/ui/icon/icon-caret-left';
 import Button from '../../components/ui/button';
 import { useI18nContext } from '../../hooks/useI18nContext';
+import {
+  ButtonIcon,
+  ICON_SIZES,
+  ICON_NAMES,
+} from '../../components/component-library';
+import { Color } from '../../helpers/constants/design-system';
 
 export function NotificationItem({ notification, snaps, onItemClick }) {
   const { message, origin, createdDate, readDate } = notification;
@@ -85,10 +90,10 @@ export default function Notifications() {
     <div className="main-container notifications">
       <div className="notifications__header">
         <div className="notifications__header__title-container">
-          <IconCaretLeft
-            className="notifications__header__title-container__back-button"
-            color="var(--color-text-default)"
-            size={23}
+          <ButtonIcon
+            iconName={ICON_NAMES.ARROW_LEFT}
+            size={ICON_SIZES.LG}
+            color={Color.textDefault}
             onClick={() => history.push(DEFAULT_ROUTE)}
           />
           <div className="notifications__header__title-container__title">
diff --git a/ui/pages/permissions-connect/index.scss b/ui/pages/permissions-connect/index.scss
index f1bcb4910..1ca3c116a 100644
--- a/ui/pages/permissions-connect/index.scss
+++ b/ui/pages/permissions-connect/index.scss
@@ -31,10 +31,6 @@
     color: var(--color-icon-default);
     font-weight: bold;
     cursor: pointer;
-
-    i {
-      margin-right: 10px;
-    }
   }
 
   &__page-count {
diff --git a/ui/pages/permissions-connect/permissions-connect.component.js b/ui/pages/permissions-connect/permissions-connect.component.js
index c3bcf5f51..28c7b373e 100644
--- a/ui/pages/permissions-connect/permissions-connect.component.js
+++ b/ui/pages/permissions-connect/permissions-connect.component.js
@@ -9,6 +9,11 @@ import { ENVIRONMENT_TYPE_NOTIFICATION } from '../../../shared/constants/app';
 import { MILLISECOND } from '../../../shared/constants/time';
 import { DEFAULT_ROUTE } from '../../helpers/constants/routes';
 import PermissionPageContainer from '../../components/app/permission-page-container';
+import {
+  Icon,
+  ICON_NAMES,
+  ICON_SIZES,
+} from '../../components/component-library';
 import ChooseAccount from './choose-account';
 import PermissionsRedirect from './redirect';
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
@@ -231,7 +236,11 @@ export default class PermissionConnect extends Component {
             className="permissions-connect__back"
             onClick={() => this.goBack()}
           >
-            <i className="fas fa-chevron-left"></i>
+            <Icon
+              name={ICON_NAMES.ARROW_RIGHT}
+              marginInlineEnd={1}
+              size={ICON_SIZES.XS}
+            />
             {t('back')}
           </div>
         ) : null}
diff --git a/ui/pages/send/send-content/add-recipient/__snapshots__/add-recipient.component.test.js.snap b/ui/pages/send/send-content/add-recipient/__snapshots__/add-recipient.component.test.js.snap
index aa4293935..579abc354 100644
--- a/ui/pages/send/send-content/add-recipient/__snapshots__/add-recipient.component.test.js.snap
+++ b/ui/pages/send/send-content/add-recipient/__snapshots__/add-recipient.component.test.js.snap
@@ -80,18 +80,10 @@ exports[`Add Recipient Component Own Account Recipient Search should match snaps
         role="button"
         tabindex="0"
       >
-        <svg
-          class="send__select-recipient-wrapper__list__back-caret"
-          fill="currentColor"
-          height="24"
-          viewBox="0 0 512 512"
-          width="24"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="m335 113c8 8 8 22 0 30l-113 113 113 113c8 8 8 22 0 30-8 8-22 8-30 0l-128-128c-8-8-8-22 0-30l128-128c8-8 22-8 30 0z"
-          />
-        </svg>
+        <div
+          class="box mm-icon mm-icon--size-md box--flex-direction-row box--color-inherit"
+          style="mask-image: url('./images/icons/arrow-left.svg');"
+        />
         Back to all
       </a>
       <div
diff --git a/ui/pages/send/send-content/add-recipient/add-recipient.component.js b/ui/pages/send/send-content/add-recipient/add-recipient.component.js
index 47ff7c97f..a30870ccf 100644
--- a/ui/pages/send/send-content/add-recipient/add-recipient.component.js
+++ b/ui/pages/send/send-content/add-recipient/add-recipient.component.js
@@ -7,8 +7,8 @@ import ContactList from '../../../../components/app/contact-list';
 import RecipientGroup from '../../../../components/app/contact-list/recipient-group/recipient-group.component';
 import { ellipsify } from '../../send.utils';
 import Button from '../../../../components/ui/button';
-import IconCaretLeft from '../../../../components/ui/icon/icon-caret-left';
 import Confusable from '../../../../components/ui/confusable';
+import { Icon, ICON_NAMES } from '../../../../components/component-library';
 
 export default class AddRecipient extends Component {
   static propTypes = {
@@ -181,7 +181,7 @@ export default class AddRecipient extends Component {
           className="send__select-recipient-wrapper__list__link"
           onClick={useContactListForRecipientSearch}
         >
-          <IconCaretLeft className="send__select-recipient-wrapper__list__back-caret" />
+          <Icon name={ICON_NAMES.ARROW_LEFT} />
           {t('backToAll')}
         </Button>
         <RecipientGroup
diff --git a/ui/pages/settings/settings-search-list/settings-search-list.js b/ui/pages/settings/settings-search-list/settings-search-list.js
index 7ed1b536a..d6fff980c 100644
--- a/ui/pages/settings/settings-search-list/settings-search-list.js
+++ b/ui/pages/settings/settings-search-list/settings-search-list.js
@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { highlightSearchedText } from '../../../helpers/utils/settings-search';
 import { I18nContext } from '../../../contexts/i18n';
-import IconCaretRight from '../../../components/ui/icon/icon-caret-right';
-import { Icon } from '../../../components/component-library';
+import { Icon, ICON_NAMES } from '../../../components/component-library';
+import { Size } from '../../../helpers/constants/design-system';
 
 export default function SettingsSearchList({ results, onClickSetting }) {
   const t = useContext(I18nContext);
@@ -44,8 +44,9 @@ export default function SettingsSearchList({ results, onClickSetting }) {
                 >
                   {tabMessage(t)}
                 </span>
-                <IconCaretRight
-                  size={16}
+                <Icon
+                  name={ICON_NAMES.ARROW_RIGHT}
+                  size={Size.SM}
                   className="settings-page__header__search__list__item__caret"
                 />
                 <span
diff --git a/ui/pages/settings/settings.component.js b/ui/pages/settings/settings.component.js
index 042702381..c7989d6e3 100644
--- a/ui/pages/settings/settings.component.js
+++ b/ui/pages/settings/settings.component.js
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import { Switch, Route, matchPath } from 'react-router-dom';
 import classnames from 'classnames';
 import TabBar from '../../components/app/tab-bar';
-import IconCaretLeft from '../../components/ui/icon/icon-caret-left';
 
 import {
   ALERTS_ROUTE,
@@ -28,7 +27,13 @@ import {
 
 import { getSettingsRoutes } from '../../helpers/utils/settings-search';
 import AddNetwork from '../../components/app/add-network/add-network';
-import { Icon, ICON_NAMES } from '../../components/component-library';
+import {
+  Icon,
+  ButtonIcon,
+  ICON_SIZES,
+  ICON_NAMES,
+} from '../../components/component-library';
+import { Color } from '../../helpers/constants/design-system';
 import SettingsTab from './settings-tab';
 import AlertsTab from './alerts-tab';
 import NetworksTab from './networks-tab';
@@ -111,6 +116,7 @@ class SettingsPage extends PureComponent {
     } = this.props;
 
     const { searchResults, isSearchList, searchText } = this.state;
+    const { t } = this.context;
 
     return (
       <div
@@ -121,10 +127,11 @@ class SettingsPage extends PureComponent {
         <div className="settings-page__header">
           <div className="settings-page__header__title-container">
             {currentPath !== SETTINGS_ROUTE && (
-              <IconCaretLeft
-                className="settings-page__back-button"
-                color="var(--color-icon-default)"
-                size={32}
+              <ButtonIcon
+                ariaLabel={t('back')}
+                name={ICON_NAMES.ARROW_LEFT}
+                size={ICON_SIZES.XL}
+                color={Color.iconDefault}
                 onClick={() => history.push(backRoute)}
               />
             )}

From d0bea6ccd521e47221d7b577e21f37b061325d1c Mon Sep 17 00:00:00 2001
From: ryanml <ryanlanese@gmail.com>
Date: Thu, 2 Mar 2023 05:40:07 -0700
Subject: [PATCH 17/36] Fix incorrect balance in signature request header
 (#17829)

* Fix incorrect balance in signature request header

* Fix unit tests

* Fix tests and increase unit test coverage

* actually fix unit tests

---------

Co-authored-by: Dan Miller <danjm.com@gmail.com>
---
 .../signature-request.component.test.js.snap  | 775 +++++++++++++++++-
 .../signature-request.component.js            |   9 +-
 .../signature-request.component.test.js       |  36 +-
 .../signature-request.container.js            |   9 +
 .../signature-request.container.test.js       |   3 +
 .../confirm-signature-request/index.test.js   |   1 +
 6 files changed, 830 insertions(+), 3 deletions(-)

diff --git a/ui/components/app/signature-request/__snapshots__/signature-request.component.test.js.snap b/ui/components/app/signature-request/__snapshots__/signature-request.component.test.js.snap
index 3b6d02fa5..df3631f5b 100644
--- a/ui/components/app/signature-request/__snapshots__/signature-request.component.test.js.snap
+++ b/ui/components/app/signature-request/__snapshots__/signature-request.component.test.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Signature Request Component render should match snapshot 1`] = `
+exports[`Signature Request Component render should match snapshot when useNativeCurrencyAsPrimaryCurrency is false 1`] = `
 <div>
   <div
     class="signature-request"
@@ -163,6 +163,779 @@ exports[`Signature Request Component render should match snapshot 1`] = `
           >
             0
              
+            DEF
+          </h6>
+        </div>
+      </div>
+    </div>
+    <div
+      class="signature-request-content"
+    >
+      <div
+        class="signature-request__origin"
+      >
+        <div
+          class="site-origin"
+        >
+          <div
+            class="chip chip--with-left-icon chip--border-color-border-muted chip--background-color-undefined"
+          >
+            <div
+              class="chip__left-icon"
+            >
+              <div
+                class=""
+              >
+                <span
+                  class="icon-with-fallback__fallback"
+                >
+                  T
+                </span>
+              </div>
+            </div>
+            <span
+              class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography chip__label typography--h6 typography--weight-normal typography--style-normal typography--color-text-alternative"
+            >
+              test
+            </span>
+          </div>
+        </div>
+      </div>
+      <h3
+        class="box box--margin-top-4 box--margin-bottom-1 box--flex-direction-row typography signature-request__content__title typography--h3 typography--weight-bold typography--style-normal typography--color-text-default"
+      >
+        Signature request
+      </h3>
+      <h6
+        class="box box--margin-12 box--margin-top-3 box--margin-bottom-1 box--flex-direction-row typography request-signature__content__subtitle typography--h7 typography--weight-normal typography--style-normal typography--align-center typography--color-text-alternative"
+      >
+        Only sign this message if you fully understand the content and trust the requesting site.
+      </h6>
+      <div>
+        <a
+          class="button btn-link signature-request-content__verify-contract-details"
+          data-testid="verify-contract-details"
+          role="button"
+          tabindex="0"
+        >
+          <h6
+            class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography typography--h7 typography--weight-normal typography--style-normal typography--color-primary-default"
+          >
+            Verify contract details
+          </h6>
+        </a>
+      </div>
+    </div>
+    <div
+      class="box signature-request-message box--display-flex box--flex-direction-column"
+    >
+      <div
+        class="box signature-request-message__root box--margin-2 box--padding-top-3 box--padding-right-3 box--padding-bottom-3 box--flex-direction-row box--background-color-background-default box--rounded-xl box--border-color-border-muted box--border-style-solid box--border-width-1"
+      >
+        <p
+          class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-message__title typography--p typography--weight-bold typography--style-normal typography--color-text-default"
+        >
+          Mail
+        </p>
+        <div
+          class="box signature-request-data__node box--flex-direction-row"
+        >
+          <div
+            class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
+          >
+            <span
+              class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+            >
+              Contents
+              :
+               
+            </span>
+            <span
+              class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+            >
+              Hello, Bob!
+            </span>
+          </div>
+          <div
+            class="box signature-request-data__node box--padding-left-2 box--flex-direction-row"
+          >
+            <span
+              class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-bold typography--style-normal typography--color-text-default"
+            >
+              From
+              :
+               
+            </span>
+            <div
+              class="box signature-request-data__node box--flex-direction-row"
+            >
+              <div
+                class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
+              >
+                <span
+                  class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                >
+                  Name
+                  :
+                   
+                </span>
+                <span
+                  class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                >
+                  Cow
+                </span>
+              </div>
+              <div
+                class="box signature-request-data__node box--padding-left-2 box--flex-direction-row"
+              >
+                <span
+                  class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-bold typography--style-normal typography--color-text-default"
+                >
+                  Wallets
+                  :
+                   
+                </span>
+                <div
+                  class="box signature-request-data__node box--flex-direction-row"
+                >
+                  <div
+                    class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
+                  >
+                    <span
+                      class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                    >
+                      0
+                      :
+                       
+                    </span>
+                    <span
+                      class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                    >
+                      <h6
+                        class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography signature-request-data__node__value__address typography--h7 typography--weight-normal typography--style-normal typography--color-info-default"
+                      >
+                        <div
+                          class="tx-insight tx-insight-component tx-insight-component-address"
+                        >
+                          <div
+                            class="tx-insight-component-address__sender-icon"
+                          >
+                            <div
+                              class=""
+                            >
+                              <div
+                                class="identicon"
+                                style="height: 18px; width: 18px; border-radius: 9px;"
+                              >
+                                <div
+                                  style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 18px; height: 18px; display: inline-block; background: rgb(35, 98, 225);"
+                                >
+                                  <svg
+                                    height="18"
+                                    width="18"
+                                    x="0"
+                                    y="0"
+                                  >
+                                    <rect
+                                      fill="#FA7900"
+                                      height="18"
+                                      transform="translate(-0.14083532437501936 -0.20904741369718938) rotate(237.8 9 9)"
+                                      width="18"
+                                      x="0"
+                                      y="0"
+                                    />
+                                    <rect
+                                      fill="#034F5E"
+                                      height="18"
+                                      transform="translate(6.169600998273832 -6.532671139783782) rotate(321.2 9 9)"
+                                      width="18"
+                                      x="0"
+                                      y="0"
+                                    />
+                                    <rect
+                                      fill="#FB185C"
+                                      height="18"
+                                      transform="translate(4.879852199205555 12.185539790934872) rotate(190.8 9 9)"
+                                      width="18"
+                                      x="0"
+                                      y="0"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <div
+                            class="address__name"
+                          >
+                            0xCD2...D826
+                          </div>
+                        </div>
+                      </h6>
+                    </span>
+                  </div>
+                  <div
+                    class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
+                  >
+                    <span
+                      class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                    >
+                      1
+                      :
+                       
+                    </span>
+                    <span
+                      class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                    >
+                      <h6
+                        class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography signature-request-data__node__value__address typography--h7 typography--weight-normal typography--style-normal typography--color-info-default"
+                      >
+                        <div
+                          class="tx-insight tx-insight-component tx-insight-component-address"
+                        >
+                          <div
+                            class="tx-insight-component-address__sender-icon"
+                          >
+                            <div
+                              class=""
+                            >
+                              <div
+                                class="identicon"
+                                style="height: 18px; width: 18px; border-radius: 9px;"
+                              >
+                                <div
+                                  style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 18px; height: 18px; display: inline-block; background: rgb(24, 183, 242);"
+                                >
+                                  <svg
+                                    height="18"
+                                    width="18"
+                                    x="0"
+                                    y="0"
+                                  >
+                                    <rect
+                                      fill="#F91E01"
+                                      height="18"
+                                      transform="translate(-3.4105516295169465 1.6271792765749349) rotate(179.5 9 9)"
+                                      width="18"
+                                      x="0"
+                                      y="0"
+                                    />
+                                    <rect
+                                      fill="#FA5300"
+                                      height="18"
+                                      transform="translate(0.0011267744354920284 -8.541150536104556) rotate(370.7 9 9)"
+                                      width="18"
+                                      x="0"
+                                      y="0"
+                                    />
+                                    <rect
+                                      fill="#F5A300"
+                                      height="18"
+                                      transform="translate(-10.876212949280989 11.550571889611607) rotate(298.9 9 9)"
+                                      width="18"
+                                      x="0"
+                                      y="0"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <div
+                            class="address__name"
+                          >
+                            0xDea...beeF
+                          </div>
+                        </div>
+                      </h6>
+                    </span>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="box signature-request-data__node box--padding-left-2 box--flex-direction-row"
+          >
+            <span
+              class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-bold typography--style-normal typography--color-text-default"
+            >
+              To
+              :
+               
+            </span>
+            <div
+              class="box signature-request-data__node box--flex-direction-row"
+            >
+              <div
+                class="box signature-request-data__node box--padding-left-2 box--flex-direction-row"
+              >
+                <span
+                  class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-bold typography--style-normal typography--color-text-default"
+                >
+                  0
+                  :
+                   
+                </span>
+                <div
+                  class="box signature-request-data__node box--flex-direction-row"
+                >
+                  <div
+                    class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
+                  >
+                    <span
+                      class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                    >
+                      Name
+                      :
+                       
+                    </span>
+                    <span
+                      class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                    >
+                      Bob
+                    </span>
+                  </div>
+                  <div
+                    class="box signature-request-data__node box--padding-left-2 box--flex-direction-row"
+                  >
+                    <span
+                      class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-bold typography--style-normal typography--color-text-default"
+                    >
+                      Wallets
+                      :
+                       
+                    </span>
+                    <div
+                      class="box signature-request-data__node box--flex-direction-row"
+                    >
+                      <div
+                        class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
+                      >
+                        <span
+                          class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                        >
+                          0
+                          :
+                           
+                        </span>
+                        <span
+                          class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                        >
+                          <h6
+                            class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography signature-request-data__node__value__address typography--h7 typography--weight-normal typography--style-normal typography--color-info-default"
+                          >
+                            <div
+                              class="tx-insight tx-insight-component tx-insight-component-address"
+                            >
+                              <div
+                                class="tx-insight-component-address__sender-icon"
+                              >
+                                <div
+                                  class=""
+                                >
+                                  <div
+                                    class="identicon"
+                                    style="height: 18px; width: 18px; border-radius: 9px;"
+                                  >
+                                    <div
+                                      style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 18px; height: 18px; display: inline-block; background: rgb(242, 162, 2);"
+                                    >
+                                      <svg
+                                        height="18"
+                                        width="18"
+                                        x="0"
+                                        y="0"
+                                      >
+                                        <rect
+                                          fill="#C8144A"
+                                          height="18"
+                                          transform="translate(3.793157784878341 -1.7274880587885135) rotate(359.3 9 9)"
+                                          width="18"
+                                          x="0"
+                                          y="0"
+                                        />
+                                        <rect
+                                          fill="#01878E"
+                                          height="18"
+                                          transform="translate(-5.130298485812891 -4.633613065334895) rotate(335.8 9 9)"
+                                          width="18"
+                                          x="0"
+                                          y="0"
+                                        />
+                                        <rect
+                                          fill="#1897F2"
+                                          height="18"
+                                          transform="translate(-14.252066920284053 2.4659095087310536) rotate(275.0 9 9)"
+                                          width="18"
+                                          x="0"
+                                          y="0"
+                                        />
+                                      </svg>
+                                    </div>
+                                  </div>
+                                </div>
+                              </div>
+                              <div
+                                class="address__name"
+                              >
+                                0xbBb...BBbB
+                              </div>
+                            </div>
+                          </h6>
+                        </span>
+                      </div>
+                      <div
+                        class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
+                      >
+                        <span
+                          class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                        >
+                          1
+                          :
+                           
+                        </span>
+                        <span
+                          class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                        >
+                          <h6
+                            class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography signature-request-data__node__value__address typography--h7 typography--weight-normal typography--style-normal typography--color-info-default"
+                          >
+                            <div
+                              class="tx-insight tx-insight-component tx-insight-component-address"
+                            >
+                              <div
+                                class="tx-insight-component-address__sender-icon"
+                              >
+                                <div
+                                  class=""
+                                >
+                                  <div
+                                    class="identicon"
+                                    style="height: 18px; width: 18px; border-radius: 9px;"
+                                  >
+                                    <div
+                                      style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 18px; height: 18px; display: inline-block; background: rgb(250, 54, 0);"
+                                    >
+                                      <svg
+                                        height="18"
+                                        width="18"
+                                        x="0"
+                                        y="0"
+                                      >
+                                        <rect
+                                          fill="#2395E1"
+                                          height="18"
+                                          transform="translate(-1.952228683702902 0.5755351329028624) rotate(191.9 9 9)"
+                                          width="18"
+                                          x="0"
+                                          y="0"
+                                        />
+                                        <rect
+                                          fill="#F90101"
+                                          height="18"
+                                          transform="translate(1.931538686012753 -10.436305366725303) rotate(319.8 9 9)"
+                                          width="18"
+                                          x="0"
+                                          y="0"
+                                        />
+                                        <rect
+                                          fill="#F58700"
+                                          height="18"
+                                          transform="translate(11.15341577077021 5.782185845756665) rotate(180.7 9 9)"
+                                          width="18"
+                                          x="0"
+                                          y="0"
+                                        />
+                                      </svg>
+                                    </div>
+                                  </div>
+                                </div>
+                              </div>
+                              <div
+                                class="address__name"
+                              >
+                                0xB0B...Ea57
+                              </div>
+                            </div>
+                          </h6>
+                        </span>
+                      </div>
+                      <div
+                        class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
+                      >
+                        <span
+                          class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                        >
+                          2
+                          :
+                           
+                        </span>
+                        <span
+                          class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                        >
+                          <h6
+                            class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography signature-request-data__node__value__address typography--h7 typography--weight-normal typography--style-normal typography--color-info-default"
+                          >
+                            <div
+                              class="tx-insight tx-insight-component tx-insight-component-address"
+                            >
+                              <div
+                                class="tx-insight-component-address__sender-icon"
+                              >
+                                <div
+                                  class=""
+                                >
+                                  <div
+                                    class="identicon"
+                                    style="height: 18px; width: 18px; border-radius: 9px;"
+                                  >
+                                    <div
+                                      style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 18px; height: 18px; display: inline-block; background: rgb(200, 20, 86);"
+                                    >
+                                      <svg
+                                        height="18"
+                                        width="18"
+                                        x="0"
+                                        y="0"
+                                      >
+                                        <rect
+                                          fill="#018E8C"
+                                          height="18"
+                                          transform="translate(4.486584319523849 0.3999308067724887) rotate(177.8 9 9)"
+                                          width="18"
+                                          x="0"
+                                          y="0"
+                                        />
+                                        <rect
+                                          fill="#F29202"
+                                          height="18"
+                                          transform="translate(-8.123544749536274 -2.791525003061714) rotate(334.6 9 9)"
+                                          width="18"
+                                          x="0"
+                                          y="0"
+                                        />
+                                        <rect
+                                          fill="#236FE1"
+                                          height="18"
+                                          transform="translate(16.44948962669253 -7.0677741181270815) rotate(456.1 9 9)"
+                                          width="18"
+                                          x="0"
+                                          y="0"
+                                        />
+                                      </svg>
+                                    </div>
+                                  </div>
+                                </div>
+                              </div>
+                              <div
+                                class="address__name"
+                              >
+                                0xB0B...0000
+                              </div>
+                            </div>
+                          </h6>
+                        </span>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="page-container__footer"
+    >
+      <footer>
+        <button
+          class="button btn--rounded btn-secondary page-container__footer-button page-container__footer-button__cancel"
+          data-testid="page-container-footer-cancel"
+          role="button"
+          tabindex="0"
+        >
+          Reject
+        </button>
+        <button
+          class="button btn--rounded btn-primary page-container__footer-button"
+          data-testid="page-container-footer-next"
+          role="button"
+          tabindex="0"
+        >
+          Sign
+        </button>
+      </footer>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`Signature Request Component render should match snapshot when useNativeCurrencyAsPrimaryCurrency is true 1`] = `
+<div>
+  <div
+    class="signature-request"
+  >
+    <div
+      class="confirm-page-container-navigation"
+      style="display: none;"
+    >
+      <div
+        class="confirm-page-container-navigation__container"
+        data-testid="navigation-container"
+        style="visibility: hidden;"
+      >
+        <button
+          class="confirm-page-container-navigation__arrow"
+          data-testid="first-page"
+        >
+          <i
+            class="fa fa-angle-double-left fa-2x"
+          />
+        </button>
+        <button
+          class="confirm-page-container-navigation__arrow"
+          data-testid="previous-page"
+        >
+          <i
+            class="fa fa-angle-left fa-2x"
+          />
+        </button>
+      </div>
+      <div
+        class="confirm-page-container-navigation__textcontainer"
+      >
+        <div
+          class="confirm-page-container-navigation__navtext"
+        >
+          0
+           
+          of
+           
+          1
+        </div>
+        <div
+          class="confirm-page-container-navigation__longtext"
+        >
+          requests waiting to be acknowledged
+        </div>
+      </div>
+      <div
+        class="confirm-page-container-navigation__container"
+        style="visibility: initial;"
+      >
+        <button
+          class="confirm-page-container-navigation__arrow"
+          data-testid="next-page"
+        >
+          <i
+            class="fa fa-angle-right fa-2x"
+          />
+        </button>
+        <button
+          class="confirm-page-container-navigation__arrow"
+          data-testid="last-page"
+        >
+          <i
+            class="fa fa-angle-double-right fa-2x"
+          />
+        </button>
+      </div>
+    </div>
+    <div
+      class="request-signature__account"
+    >
+      <div
+        class="box network-account-balance-header box--padding-4 box--display-flex box--flex-direction-row box--justify-content-space-between box--align-items-center"
+      >
+        <div
+          class="box box--display-flex box--gap-2 box--flex-direction-row box--align-items-center"
+        >
+          <div
+            class="box box--display-flex box--flex-direction-row box--align-items-center"
+          >
+            <div
+              class=""
+            >
+              <div
+                class="identicon"
+                style="height: 32px; width: 32px; border-radius: 16px;"
+              >
+                <div
+                  style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(245, 228, 0);"
+                >
+                  <svg
+                    height="32"
+                    width="32"
+                    x="0"
+                    y="0"
+                  >
+                    <rect
+                      fill="#F2BE02"
+                      height="32"
+                      transform="translate(5.482725134273373 -5.1953603353074) rotate(387.1 16 16)"
+                      width="32"
+                      x="0"
+                      y="0"
+                    />
+                    <rect
+                      fill="#01778E"
+                      height="32"
+                      transform="translate(-2.6054559418209475 16.704606255523125) rotate(227.4 16 16)"
+                      width="32"
+                      x="0"
+                      y="0"
+                    />
+                    <rect
+                      fill="#C81435"
+                      height="32"
+                      transform="translate(17.969690840904306 -12.592649051897114) rotate(422.3 16 16)"
+                      width="32"
+                      x="0"
+                      y="0"
+                    />
+                  </svg>
+                </div>
+              </div>
+            </div>
+            <div
+              class="network-account-balance-header__network-account__ident-icon-ethereum--gray"
+            >
+              <span
+                class="icon-with-fallback__fallback"
+              >
+                U
+              </span>
+            </div>
+          </div>
+          <div
+            class="box box--display-flex box--flex-direction-column box--align-items-flex-start"
+          >
+            <h6
+              class="box box--margin-top-1 box--flex-direction-row typography typography--h6 typography--weight-normal typography--style-normal typography--color-text-alternative"
+            >
+              Unknown private network
+            </h6>
+            <h6
+              class="box box--margin-bottom-1 box--flex-direction-row typography typography--h6 typography--weight-bold typography--style-normal typography--color-text-default"
+            />
+          </div>
+        </div>
+        <div
+          class="box box--display-flex box--flex-direction-column box--align-items-flex-end"
+        >
+          <h6
+            class="box box--margin-top-1 box--flex-direction-row typography typography--h6 typography--weight-normal typography--style-normal typography--color-text-alternative"
+          >
+            Balance
+          </h6>
+          <h6
+            class="box box--margin-bottom-1 box--flex-direction-row typography typography--h6 typography--weight-bold typography--style-normal typography--align-end typography--color-text-default"
+          >
+            0
+             
+            ABC
           </h6>
         </div>
       </div>
diff --git a/ui/components/app/signature-request/signature-request.component.js b/ui/components/app/signature-request/signature-request.component.js
index a1cfa7682..81a8fc989 100644
--- a/ui/components/app/signature-request/signature-request.component.js
+++ b/ui/components/app/signature-request/signature-request.component.js
@@ -66,6 +66,8 @@ export default class SignatureRequest extends PureComponent {
     siteImage: PropTypes.string,
     conversionRate: PropTypes.number,
     nativeCurrency: PropTypes.string,
+    currentCurrency: PropTypes.string.isRequired,
+    useNativeCurrencyAsPrimaryCurrency: PropTypes.bool.isRequired,
     provider: PropTypes.object,
     subjectMetadata: PropTypes.object,
     unapprovedMessagesCount: PropTypes.number,
@@ -160,6 +162,8 @@ export default class SignatureRequest extends PureComponent {
       subjectMetadata,
       conversionRate,
       nativeCurrency,
+      currentCurrency,
+      useNativeCurrencyAsPrimaryCurrency,
       unapprovedMessagesCount,
     } = this.props;
     const { t, trackEvent } = this.context;
@@ -170,6 +174,9 @@ export default class SignatureRequest extends PureComponent {
     } = this.memoizedParseMessage(data);
     const rejectNText = t('rejectRequestsN', [unapprovedMessagesCount]);
     const currentNetwork = this.getNetworkName();
+    const tokenName = useNativeCurrencyAsPrimaryCurrency
+      ? nativeCurrency
+      : currentCurrency?.toUpperCase();
 
     const balanceInBaseAsset = new Numeric(balance, 16, EtherDenomination.WEI)
       .toDenomination(EtherDenomination.ETH)
@@ -220,7 +227,7 @@ export default class SignatureRequest extends PureComponent {
             networkName={currentNetwork}
             accountName={name}
             accountBalance={balanceInBaseAsset}
-            tokenName={nativeCurrency}
+            tokenName={tokenName}
             accountAddress={address}
           />
         </div>
diff --git a/ui/components/app/signature-request/signature-request.component.test.js b/ui/components/app/signature-request/signature-request.component.test.js
index 5a26ba073..8c21d71e7 100644
--- a/ui/components/app/signature-request/signature-request.component.test.js
+++ b/ui/components/app/signature-request/signature-request.component.test.js
@@ -62,7 +62,7 @@ describe('Signature Request Component', () => {
       };
     });
 
-    it('should match snapshot', () => {
+    it('should match snapshot when useNativeCurrencyAsPrimaryCurrency is false', () => {
       const msgParams = {
         data: JSON.stringify(messageData),
         version: 'V4',
@@ -83,6 +83,40 @@ describe('Signature Request Component', () => {
           }}
           fromAccount={{ address: fromAddress }}
           provider={{ type: 'rpc' }}
+          useNativeCurrencyAsPrimaryCurrency={false}
+          nativeCurrency="ABC"
+          currentCurrency="DEF"
+        />,
+        store,
+      );
+
+      expect(container).toMatchSnapshot();
+    });
+
+    it('should match snapshot when useNativeCurrencyAsPrimaryCurrency is true', () => {
+      const msgParams = {
+        data: JSON.stringify(messageData),
+        version: 'V4',
+        origin: 'test',
+      };
+      const { container } = renderWithProvider(
+        <SignatureRequest
+          hardwareWalletRequiresConnection={false}
+          clearConfirmTransaction={() => undefined}
+          cancel={() => undefined}
+          cancelAll={() => undefined}
+          mostRecentOverviewPage="/"
+          showRejectTransactionsConfirmationModal={() => undefined}
+          history={{ push: '/' }}
+          sign={() => undefined}
+          txData={{
+            msgParams,
+          }}
+          fromAccount={{ address: fromAddress }}
+          provider={{ type: 'rpc' }}
+          useNativeCurrencyAsPrimaryCurrency
+          nativeCurrency="ABC"
+          currentCurrency="DEF"
         />,
         store,
       );
diff --git a/ui/components/app/signature-request/signature-request.container.js b/ui/components/app/signature-request/signature-request.container.js
index 52a67c1ec..ac3bd2d38 100644
--- a/ui/components/app/signature-request/signature-request.container.js
+++ b/ui/components/app/signature-request/signature-request.container.js
@@ -8,6 +8,8 @@ import {
   getSubjectMetadata,
   unconfirmedMessagesHashSelector,
   getTotalUnapprovedMessagesCount,
+  getCurrentCurrency,
+  getPreferences,
 } from '../../../selectors';
 import {
   isAddressLedger,
@@ -35,6 +37,7 @@ function mapStateToProps(state, ownProps) {
   const subjectMetadata = getSubjectMetadata(state);
   const unconfirmedMessagesList = unconfirmedMessagesHashSelector(state);
   const unapprovedMessagesCount = getTotalUnapprovedMessagesCount(state);
+  const { useNativeCurrencyAsPrimaryCurrency } = getPreferences(state);
 
   const { iconUrl: siteImage = '' } =
     subjectMetadata[txData.msgParams.origin] || {};
@@ -51,6 +54,8 @@ function mapStateToProps(state, ownProps) {
     mostRecentOverviewPage: getMostRecentOverviewPage(state),
     conversionRate: conversionRateSelector(state),
     nativeCurrency: getNativeCurrency(state),
+    currentCurrency: getCurrentCurrency(state),
+    useNativeCurrencyAsPrimaryCurrency,
     subjectMetadata: getSubjectMetadata(state),
     // not forwarded to component
     allAccounts: accountsWithSendEtherInfoSelector(state),
@@ -88,6 +93,8 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
     siteImage,
     conversionRate,
     nativeCurrency,
+    currentCurrency,
+    useNativeCurrencyAsPrimaryCurrency,
     provider,
     subjectMetadata,
     unconfirmedMessagesList,
@@ -141,6 +148,8 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
     siteImage,
     conversionRate,
     nativeCurrency,
+    currentCurrency,
+    useNativeCurrencyAsPrimaryCurrency,
     provider,
     subjectMetadata,
     unapprovedMessagesCount,
diff --git a/ui/components/app/signature-request/signature-request.container.test.js b/ui/components/app/signature-request/signature-request.container.test.js
index e8c4a1e1e..8e3411b86 100644
--- a/ui/components/app/signature-request/signature-request.container.test.js
+++ b/ui/components/app/signature-request/signature-request.container.test.js
@@ -51,6 +51,9 @@ describe('Signature Request', () => {
       provider: {
         type: 'rpc',
       },
+      preferences: {
+        useNativeCurrencyAsPrimaryCurrency: true,
+      },
       accounts: {
         '0xd8f6a2ffb0fc5952d16c9768b71cfd35b6399aa5': {
           address: '0xd8f6a2ffb0fc5952d16c9768b71cfd35b6399aa5',
diff --git a/ui/pages/confirm-signature-request/index.test.js b/ui/pages/confirm-signature-request/index.test.js
index 93c80b53a..417437a97 100644
--- a/ui/pages/confirm-signature-request/index.test.js
+++ b/ui/pages/confirm-signature-request/index.test.js
@@ -47,6 +47,7 @@ const mockState = {
     selectedAddress: '0x8eeee1781fd885ff5ddef7789486676961873d12',
     addressBook: {},
     tokenList: {},
+    preferences: {},
   },
   appState: {
     warning: null,

From 27f322c7dba5a2a82160a1b42b1b513b3c3bebbc Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Mon, 27 Feb 2023 17:33:21 +0100
Subject: [PATCH 18/36] Selector performance improvements (#17410)

* Stop checksumming addresses unnecesarily

* Fix lint
---
 ui/selectors/selectors.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 05162d44d..3a3bd994e 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -49,7 +49,6 @@ import {
 
 import { TEMPLATED_CONFIRMATION_MESSAGE_TYPES } from '../pages/confirmation/templates';
 import { STATIC_MAINNET_TOKEN_LIST } from '../../shared/constants/tokens';
-import { toChecksumHexAddress } from '../../shared/modules/hexstring-utils';
 import { DAY } from '../../shared/constants/time';
 import {
   getNativeCurrency,
@@ -398,7 +397,7 @@ export function getEnsResolutionByAddress(state, address) {
   const entry =
     getAddressBookEntry(state, address) ||
     Object.values(state.metamask.identities).find((identity) =>
-      isEqualCaseInsensitive(identity.address, toChecksumHexAddress(address)),
+      isEqualCaseInsensitive(identity.address, address),
     );
 
   return entry?.name || '';
@@ -407,7 +406,7 @@ export function getEnsResolutionByAddress(state, address) {
 export function getAddressBookEntry(state, address) {
   const addressBook = getAddressBook(state);
   const entry = addressBook.find((contact) =>
-    isEqualCaseInsensitive(contact.address, toChecksumHexAddress(address)),
+    isEqualCaseInsensitive(contact.address, address),
   );
   return entry;
 }
@@ -416,14 +415,14 @@ export function getAddressBookEntryOrAccountName(state, address) {
   const entry =
     getAddressBookEntry(state, address) ||
     Object.values(state.metamask.identities).find((identity) =>
-      isEqualCaseInsensitive(identity.address, toChecksumHexAddress(address)),
+      isEqualCaseInsensitive(identity.address, address),
     );
   return entry && entry.name !== '' ? entry.name : address;
 }
 
 export function getAccountName(identities, address) {
   const entry = Object.values(identities).find((identity) =>
-    isEqualCaseInsensitive(identity.address, toChecksumHexAddress(address)),
+    isEqualCaseInsensitive(identity.address, address),
   );
   return entry && entry.name !== '' ? entry.name : '';
 }
@@ -431,7 +430,7 @@ export function getAccountName(identities, address) {
 export function getMetadataContractName(state, address) {
   const tokenList = getTokenList(state);
   const entry = Object.values(tokenList).find((identity) =>
-    isEqualCaseInsensitive(identity.address, toChecksumHexAddress(address)),
+    isEqualCaseInsensitive(identity.address, address),
   );
   return entry && entry.name !== '' ? entry.name : '';
 }
@@ -844,9 +843,8 @@ export const getMemoizedMetadataContractName = createDeepEqualSelector(
   getTokenList,
   (_tokenList, address) => address,
   (tokenList, address) => {
-    const checksumHexAddress = toChecksumHexAddress(address);
     const entry = Object.values(tokenList).find((identity) =>
-      isEqualCaseInsensitive(identity.address, checksumHexAddress),
+      isEqualCaseInsensitive(identity.address, address),
     );
     return entry && entry.name !== '' ? entry.name : '';
   },

From 5933dd1fd7b1f6224ff738faf8ef01042e18113b Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Fri, 3 Mar 2023 15:11:20 -0600
Subject: [PATCH 19/36] UX: Icon: Restore missing back chevron in settings
 (#17916)

* UX: Icon: Restore missing back chevron in settings

* Update ui/pages/settings/settings.component.js

Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>

* Fixing size and alignment

---------

Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>
Co-authored-by: georgewrmarshall <george.marshall@consensys.net>
Co-authored-by: Garrett Bear <gwhisten@gmail.com>
---
 ui/pages/settings/index.scss            | 14 ++++----------
 ui/pages/settings/settings.component.js |  8 ++++----
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/ui/pages/settings/index.scss b/ui/pages/settings/index.scss
index 21eb8b6e8..465b72f6d 100644
--- a/ui/pages/settings/index.scss
+++ b/ui/pages/settings/index.scss
@@ -216,17 +216,11 @@
   }
 
   &__back-button {
-    display: none;
+    margin-right: 8px;
 
-    @include screen-sm-max {
-      display: block;
-      margin-right: 8px;
-      cursor: pointer;
-
-      [dir='rtl'] & {
-        margin: 0 0 0 8px;
-        transform: rotate(180deg);
-      }
+    [dir='rtl'] & {
+      margin: 0 0 0 8px;
+      transform: rotate(180deg);
     }
   }
 
diff --git a/ui/pages/settings/settings.component.js b/ui/pages/settings/settings.component.js
index c7989d6e3..0ef390f70 100644
--- a/ui/pages/settings/settings.component.js
+++ b/ui/pages/settings/settings.component.js
@@ -30,10 +30,9 @@ import AddNetwork from '../../components/app/add-network/add-network';
 import {
   Icon,
   ButtonIcon,
-  ICON_SIZES,
   ICON_NAMES,
 } from '../../components/component-library';
-import { Color } from '../../helpers/constants/design-system';
+import { Color, DISPLAY } from '../../helpers/constants/design-system';
 import SettingsTab from './settings-tab';
 import AlertsTab from './alerts-tab';
 import NetworksTab from './networks-tab';
@@ -129,10 +128,11 @@ class SettingsPage extends PureComponent {
             {currentPath !== SETTINGS_ROUTE && (
               <ButtonIcon
                 ariaLabel={t('back')}
-                name={ICON_NAMES.ARROW_LEFT}
-                size={ICON_SIZES.XL}
+                iconName={ICON_NAMES.ARROW_LEFT}
+                className="settings-page__back-button"
                 color={Color.iconDefault}
                 onClick={() => history.push(backRoute)}
+                display={[DISPLAY.FLEX, DISPLAY.NONE]}
               />
             )}
 

From 353c9927b4b66d678d0907b20520af05c4dbf916 Mon Sep 17 00:00:00 2001
From: Danica Shen <zhaodanica@gmail.com>
Date: Sat, 4 Mar 2023 12:14:20 +0000
Subject: [PATCH 20/36] fix(17857): show correctly converted account balance in
 sign&encrypt windows (#17973)

Co-authored-by: Dan J Miller <danjm.com@gmail.com>
---
 test/data/mock-state.json                       |  2 +-
 test/e2e/tests/encrypt-decrypt.spec.js          | 17 +++++++++++++----
 .../signature-request-original.test.js.snap     |  2 +-
 .../signature-request.component.js              |  3 ---
 .../signature-request.container.js              |  4 ----
 .../confirm-decrypt-message.component.js        |  5 ++---
 .../confirm-decrypt-message.container.js        |  2 --
 .../confirm-encryption-public-key.component.js  |  4 +---
 .../confirm-encryption-public-key.container.js  |  2 --
 .../confirm-encryption-public-key.stories.js    |  6 ------
 ui/selectors/selectors.test.js                  | 10 +++++++---
 11 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/test/data/mock-state.json b/test/data/mock-state.json
index e2eb7d9fd..2b273dc01 100644
--- a/test/data/mock-state.json
+++ b/test/data/mock-state.json
@@ -193,7 +193,7 @@
     "selectedAddress": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc",
     "accounts": {
       "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc": {
-        "balance": "0x0",
+        "balance": "0x346ba7725f412cbfdb",
         "address": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc"
       },
       "0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b": {
diff --git a/test/e2e/tests/encrypt-decrypt.spec.js b/test/e2e/tests/encrypt-decrypt.spec.js
index e34908117..0507bf527 100644
--- a/test/e2e/tests/encrypt-decrypt.spec.js
+++ b/test/e2e/tests/encrypt-decrypt.spec.js
@@ -30,7 +30,7 @@ describe('Encrypt Decrypt', function () {
         await driver.press('#password', driver.Key.ENTER);
         await driver.openNewPage('http://127.0.0.1:8080');
 
-        // Get Encryption key
+        // ------ Get Encryption key ------
         await driver.clickElement('#getEncryptionKeyButton');
         await driver.waitUntilXWindowHandles(3);
         let windowHandles = await driver.getAllWindowHandles();
@@ -42,6 +42,11 @@ describe('Encrypt Decrypt', function () {
           css: '.request-encryption-public-key__header__text',
           text: 'Request encryption public key',
         });
+        // Account balance is converted properly
+        const accountBalanceLabel = await driver.findElement(
+          '.request-encryption-public-key__balance-value',
+        );
+        assert.equal(await accountBalanceLabel.getText(), '25 ETH');
         await driver.clickElement({ text: 'Provide', tag: 'button' });
         await driver.waitUntilXWindowHandles(2);
         windowHandles = await driver.getAllWindowHandles();
@@ -51,7 +56,7 @@ describe('Encrypt Decrypt', function () {
         );
         assert.equal(await encryptionKeyLabel.getText(), encryptionKey);
 
-        // Encrypt
+        // ------ Encrypt ------
         await driver.fill('#encryptMessageInput', message);
         await driver.clickElement('#encryptButton');
         await driver.waitForSelector({
@@ -59,7 +64,7 @@ describe('Encrypt Decrypt', function () {
           text: '0x',
         });
 
-        // Decrypt
+        // ------ Decrypt ------
         await driver.clickElement('#decryptButton');
         await driver.waitUntilXWindowHandles(3);
         windowHandles = await driver.getAllWindowHandles();
@@ -71,7 +76,11 @@ describe('Encrypt Decrypt', function () {
           css: '.request-decrypt-message__header__text',
           text: 'Decrypt request',
         });
-
+        // Account balance is converted properly
+        const decryptAccountBalanceLabel = await driver.findElement(
+          '.request-decrypt-message__balance-value',
+        );
+        assert.equal(await decryptAccountBalanceLabel.getText(), '25 ETH');
         // Verify message in MetaMask Notification
         await driver.clickElement({ text: 'Decrypt message', tag: 'div' });
         const notificationMessage = await driver.isElementPresent({
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 c225cfb88..00d474e50 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
@@ -167,7 +167,7 @@ exports[`SignatureRequestOriginal should match snapshot 1`] = `
           <h6
             class="box box--margin-bottom-1 box--flex-direction-row typography typography--h6 typography--weight-bold typography--style-normal typography--align-end typography--color-text-default"
           >
-            0
+            966.987986
              
             ETH
           </h6>
diff --git a/ui/components/app/signature-request/signature-request.component.js b/ui/components/app/signature-request/signature-request.component.js
index 81a8fc989..5c83850cb 100644
--- a/ui/components/app/signature-request/signature-request.component.js
+++ b/ui/components/app/signature-request/signature-request.component.js
@@ -64,7 +64,6 @@ export default class SignatureRequest extends PureComponent {
      * Dapp image
      */
     siteImage: PropTypes.string,
-    conversionRate: PropTypes.number,
     nativeCurrency: PropTypes.string,
     currentCurrency: PropTypes.string.isRequired,
     useNativeCurrencyAsPrimaryCurrency: PropTypes.bool.isRequired,
@@ -160,7 +159,6 @@ export default class SignatureRequest extends PureComponent {
       siteImage,
       txData,
       subjectMetadata,
-      conversionRate,
       nativeCurrency,
       currentCurrency,
       useNativeCurrencyAsPrimaryCurrency,
@@ -180,7 +178,6 @@ export default class SignatureRequest extends PureComponent {
 
     const balanceInBaseAsset = new Numeric(balance, 16, EtherDenomination.WEI)
       .toDenomination(EtherDenomination.ETH)
-      .applyConversionRate(conversionRate)
       .round(6)
       .toBase(10)
       .toString();
diff --git a/ui/components/app/signature-request/signature-request.container.js b/ui/components/app/signature-request/signature-request.container.js
index ac3bd2d38..a9308197a 100644
--- a/ui/components/app/signature-request/signature-request.container.js
+++ b/ui/components/app/signature-request/signature-request.container.js
@@ -4,7 +4,6 @@ import {
   doesAddressRequireLedgerHidConnection,
   getCurrentChainId,
   getRpcPrefsForCurrentProvider,
-  conversionRateSelector,
   getSubjectMetadata,
   unconfirmedMessagesHashSelector,
   getTotalUnapprovedMessagesCount,
@@ -52,7 +51,6 @@ function mapStateToProps(state, ownProps) {
     unconfirmedMessagesList,
     unapprovedMessagesCount,
     mostRecentOverviewPage: getMostRecentOverviewPage(state),
-    conversionRate: conversionRateSelector(state),
     nativeCurrency: getNativeCurrency(state),
     currentCurrency: getCurrentCurrency(state),
     useNativeCurrencyAsPrimaryCurrency,
@@ -91,7 +89,6 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
     chainId,
     rpcPrefs,
     siteImage,
-    conversionRate,
     nativeCurrency,
     currentCurrency,
     useNativeCurrencyAsPrimaryCurrency,
@@ -146,7 +143,6 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
     chainId,
     rpcPrefs,
     siteImage,
-    conversionRate,
     nativeCurrency,
     currentCurrency,
     useNativeCurrencyAsPrimaryCurrency,
diff --git a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.js b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.js
index e175638b5..6066c7fd0 100644
--- a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.js
+++ b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.js
@@ -32,7 +32,6 @@ export default class ConfirmDecryptMessage extends Component {
     cancelDecryptMessage: PropTypes.func.isRequired,
     decryptMessage: PropTypes.func.isRequired,
     decryptMessageInline: PropTypes.func.isRequired,
-    conversionRate: PropTypes.number,
     history: PropTypes.object.isRequired,
     mostRecentOverviewPage: PropTypes.string.isRequired,
     requesterAddress: PropTypes.string,
@@ -95,7 +94,7 @@ export default class ConfirmDecryptMessage extends Component {
   };
 
   renderBalance = () => {
-    const { conversionRate, nativeCurrency } = this.props;
+    const { nativeCurrency } = this.props;
     const {
       fromAccount: { balance },
     } = this.state;
@@ -106,7 +105,7 @@ export default class ConfirmDecryptMessage extends Component {
       16,
       EtherDenomination.WEI,
     )
-      .applyConversionRate(conversionRate)
+      .toDenomination(EtherDenomination.ETH)
       .round(6)
       .toBase(10);
 
diff --git a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.container.js b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.container.js
index 57358ecdd..4e59137b3 100644
--- a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.container.js
+++ b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.container.js
@@ -11,7 +11,6 @@ import {
 import {
   getTargetAccountWithSendEtherInfo,
   unconfirmedTransactionsListSelector,
-  conversionRateSelector,
 } from '../../selectors';
 import { clearConfirmTransaction } from '../../ducks/confirm-transaction/confirm-transaction.duck';
 import { getMostRecentOverviewPage } from '../../ducks/history/history';
@@ -38,7 +37,6 @@ function mapStateToProps(state) {
     fromAccount,
     requester: null,
     requesterAddress: null,
-    conversionRate: conversionRateSelector(state),
     mostRecentOverviewPage: getMostRecentOverviewPage(state),
     nativeCurrency: getNativeCurrency(state),
   };
diff --git a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js
index f7f58258e..1ef3a9260 100644
--- a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js
+++ b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js
@@ -26,7 +26,6 @@ export default class ConfirmEncryptionPublicKey extends Component {
     clearConfirmTransaction: PropTypes.func.isRequired,
     cancelEncryptionPublicKey: PropTypes.func.isRequired,
     encryptionPublicKey: PropTypes.func.isRequired,
-    conversionRate: PropTypes.number,
     history: PropTypes.object.isRequired,
     requesterAddress: PropTypes.string,
     txData: PropTypes.object,
@@ -70,7 +69,6 @@ export default class ConfirmEncryptionPublicKey extends Component {
 
   renderBalance = () => {
     const {
-      conversionRate,
       nativeCurrency,
       fromAccount: { balance },
     } = this.props;
@@ -81,7 +79,7 @@ export default class ConfirmEncryptionPublicKey extends Component {
       16,
       EtherDenomination.WEI,
     )
-      .applyConversionRate(conversionRate)
+      .toDenomination(EtherDenomination.ETH)
       .round(6)
       .toBase(10);
 
diff --git a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js
index 5fd0a07af..554ba41fd 100644
--- a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js
+++ b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js
@@ -9,7 +9,6 @@ import {
 } from '../../store/actions';
 
 import {
-  conversionRateSelector,
   unconfirmedTransactionsListSelector,
   getTargetAccountWithSendEtherInfo,
 } from '../../selectors';
@@ -39,7 +38,6 @@ function mapStateToProps(state) {
     fromAccount,
     requester: null,
     requesterAddress: null,
-    conversionRate: conversionRateSelector(state),
     mostRecentOverviewPage: getMostRecentOverviewPage(state),
     nativeCurrency: getNativeCurrency(state),
   };
diff --git a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.stories.js b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.stories.js
index cbf8ce060..283b32d45 100644
--- a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.stories.js
+++ b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.stories.js
@@ -28,11 +28,6 @@ export default {
     encryptionPublicKey: {
       action: 'encryptionPublicKey',
     },
-    conversionRate: {
-      control: {
-        type: 'number',
-      },
-    },
     history: {
       control: {
         type: 'object',
@@ -66,7 +61,6 @@ export default {
   },
   args: {
     fromAccount: metamask.accountArray[0],
-    conversionRate: metamask.conversionRate,
     history: {
       push: action('history.push()'),
     },
diff --git a/ui/selectors/selectors.test.js b/ui/selectors/selectors.test.js
index c507c4f2d..d0add721b 100644
--- a/ui/selectors/selectors.test.js
+++ b/ui/selectors/selectors.test.js
@@ -63,7 +63,7 @@ describe('Selectors', () => {
 
   it('returns selected account', () => {
     const account = selectors.getSelectedAccount(mockState);
-    expect(account.balance).toStrictEqual('0x0');
+    expect(account.balance).toStrictEqual('0x346ba7725f412cbfdb');
     expect(account.address).toStrictEqual(
       '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
     );
@@ -138,7 +138,9 @@ describe('Selectors', () => {
     const accountsWithSendEther =
       selectors.accountsWithSendEtherInfoSelector(mockState);
     expect(accountsWithSendEther).toHaveLength(4);
-    expect(accountsWithSendEther[0].balance).toStrictEqual('0x0');
+    expect(accountsWithSendEther[0].balance).toStrictEqual(
+      '0x346ba7725f412cbfdb',
+    );
     expect(accountsWithSendEther[0].address).toStrictEqual(
       '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
     );
@@ -148,7 +150,9 @@ describe('Selectors', () => {
   it('returns selected account with balance, address, and name from accountsWithSendEtherInfoSelector', () => {
     const currentAccountwithSendEther =
       selectors.getCurrentAccountWithSendEtherInfo(mockState);
-    expect(currentAccountwithSendEther.balance).toStrictEqual('0x0');
+    expect(currentAccountwithSendEther.balance).toStrictEqual(
+      '0x346ba7725f412cbfdb',
+    );
     expect(currentAccountwithSendEther.address).toStrictEqual(
       '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
     );

From ceab2a0b11649e51b95f5d2aa19dcefc1ddfe24e Mon Sep 17 00:00:00 2001
From: PeterYinusa <peter.yinusa@consensys.net>
Date: Mon, 6 Mar 2023 18:34:18 +0000
Subject: [PATCH 21/36] Update the PhishingController to v2 and update phishing
 warning page (#17835)

The PhishingController has been updated to v2. This release should
dramatically reduce network traffic and double the update speed of the
phishing list.

This was accomplished by combining both of our phishing configurations
into one list (the "stalelist"), then creating a separate list of the
changes just the past few days (the "hotlist"). Now users will download
a smaller list more frequently (every 30 minutes rather than every
hour), whereas the full list is only updated every 4 days.

The combined configuration means that we no longer know which list was
responsible for each block. The phishing warning page has been updated
to dynamically look this information up, to ensure users are still
directed to the correct place to dispute a block. This update to the
phishing warning page also includes the recent redesign.
---
 app/scripts/contentscript.js                  |   7 +-
 .../metamask-controller.actions.test.js       |  16 +-
 app/scripts/metamask-controller.js            |  22 +-
 app/scripts/metamask-controller.test.js       |  16 +-
 app/scripts/migrations/078.js                 |  38 ++++
 app/scripts/migrations/078.test.js            | 108 ++++++++++
 app/scripts/migrations/index.js               |   2 +
 lavamoat/browserify/beta/policy.json          |   4 +-
 lavamoat/browserify/desktop/policy.json       |   4 +-
 lavamoat/browserify/flask/policy.json         |   4 +-
 lavamoat/browserify/main/policy.json          |   4 +-
 package.json                                  |   4 +-
 shared/constants/phishing.js                  |   4 -
 test/e2e/mock-e2e.js                          |  31 +++
 test/e2e/tests/phishing-detection.spec.js     | 191 +++++++++++++++---
 yarn.lock                                     |  48 ++---
 16 files changed, 395 insertions(+), 108 deletions(-)
 create mode 100644 app/scripts/migrations/078.js
 create mode 100644 app/scripts/migrations/078.test.js
 delete mode 100644 shared/constants/phishing.js

diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
index 6fbdc741f..73bce1672 100644
--- a/app/scripts/contentscript.js
+++ b/app/scripts/contentscript.js
@@ -605,16 +605,13 @@ function notifyInpageOfStreamFailure() {
 
 /**
  * Redirects the current page to a phishing information page
- *
- * @param data
  */
-function redirectToPhishingWarning(data = {}) {
+function redirectToPhishingWarning() {
   console.debug('MetaMask: Routing to Phishing Warning page.');
   const { hostname, href } = window.location;
-  const { newIssueUrl } = data;
   const baseUrl = process.env.PHISHING_WARNING_PAGE_URL;
 
-  const querystring = new URLSearchParams({ hostname, href, newIssueUrl });
+  const querystring = new URLSearchParams({ hostname, href });
   window.location.href = `${baseUrl}#${querystring}`;
 }
 
diff --git a/app/scripts/metamask-controller.actions.test.js b/app/scripts/metamask-controller.actions.test.js
index 64d409ed7..e15a84580 100644
--- a/app/scripts/metamask-controller.actions.test.js
+++ b/app/scripts/metamask-controller.actions.test.js
@@ -62,19 +62,25 @@ describe('MetaMaskController', function () {
   beforeEach(function () {
     nock('https://static.metafi.codefi.network')
       .persist()
-      .get('/api/v1/lists/eth_phishing_detect_config.json')
+      .get('/api/v1/lists/stalelist.json')
       .reply(
         200,
         JSON.stringify({
           version: 2,
           tolerance: 2,
           fuzzylist: [],
-          whitelist: [],
-          blacklist: ['127.0.0.1'],
+          allowlist: [],
+          blocklist: ['127.0.0.1'],
+          lastUpdated: 0,
         }),
       )
-      .get('/api/v1/lists/phishfort_hotlist.json')
-      .reply(200, JSON.stringify(['127.0.0.1']));
+      .get('/api/v1/lists/hotlist.json')
+      .reply(
+        200,
+        JSON.stringify([
+          { url: '127.0.0.1', targetList: 'blocklist', timestamp: 0 },
+        ]),
+      );
     metamaskController = new MetaMaskController({
       showUserConfirmation: noop,
       encryptor: {
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index b72c68741..fe7782bc6 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -69,7 +69,6 @@ import {
   TransactionStatus,
   TransactionType,
 } from '../../shared/constants/transaction';
-import { PHISHING_NEW_ISSUE_URLS } from '../../shared/constants/phishing';
 import {
   GAS_API_BASE_URL,
   GAS_DEV_API_BASE_URL,
@@ -509,10 +508,11 @@ export default class MetamaskController extends EventEmitter {
       initState.PhishingController,
     );
 
-    this.phishingController.maybeUpdatePhishingLists();
+    this.phishingController.maybeUpdateState();
 
     if (process.env.IN_TEST) {
-      this.phishingController.setRefreshInterval(5 * SECOND);
+      this.phishingController.setHotlistRefreshInterval(5 * SECOND);
+      this.phishingController.setStalelistRefreshInterval(30 * SECOND);
     }
 
     this.announcementController = new AnnouncementController(
@@ -3601,15 +3601,11 @@ export default class MetamaskController extends EventEmitter {
 
     if (sender.url) {
       const { hostname } = new URL(sender.url);
-      this.phishingController.maybeUpdatePhishingLists();
+      this.phishingController.maybeUpdateState();
       // Check if new connection is blocked if phishing detection is on
       const phishingTestResponse = this.phishingController.test(hostname);
       if (usePhishDetect && phishingTestResponse?.result) {
-        this.sendPhishingWarning(
-          connectionStream,
-          hostname,
-          phishingTestResponse,
-        );
+        this.sendPhishingWarning(connectionStream, hostname);
         this.metaMetricsController.trackEvent({
           event: EVENT_NAMES.PHISHING_PAGE_DISPLAYED,
           category: EVENT.CATEGORIES.PHISHING,
@@ -3694,15 +3690,11 @@ export default class MetamaskController extends EventEmitter {
    * @param {*} connectionStream - The duplex stream to the per-page script,
    * for sending the reload attempt to.
    * @param {string} hostname - The hostname that triggered the suspicion.
-   * @param {object} phishingTestResponse - Result of calling `phishingController.test`,
-   * which is the result of calling eth-phishing-detects detector.check method https://github.com/MetaMask/eth-phishing-detect/blob/master/src/detector.js#L55-L112
    */
-  sendPhishingWarning(connectionStream, hostname, phishingTestResponse) {
-    const newIssueUrl = PHISHING_NEW_ISSUE_URLS[phishingTestResponse?.name];
-
+  sendPhishingWarning(connectionStream, hostname) {
     const mux = setupMultiplex(connectionStream);
     const phishingStream = mux.createStream('phishing');
-    phishingStream.write({ hostname, newIssueUrl });
+    phishingStream.write({ hostname });
   }
 
   /**
diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js
index 9a4c49684..ab78c3100 100644
--- a/app/scripts/metamask-controller.test.js
+++ b/app/scripts/metamask-controller.test.js
@@ -121,19 +121,25 @@ describe('MetaMaskController', function () {
       .reply(200, '{"JPY":12415.9}');
     nock('https://static.metafi.codefi.network')
       .persist()
-      .get('/api/v1/lists/eth_phishing_detect_config.json')
+      .get('/api/v1/lists/stalelist.json')
       .reply(
         200,
         JSON.stringify({
           version: 2,
           tolerance: 2,
           fuzzylist: [],
-          whitelist: [],
-          blacklist: ['127.0.0.1'],
+          allowlist: [],
+          blocklist: ['127.0.0.1'],
+          lastUpdated: 0,
         }),
       )
-      .get('/api/v1/lists/phishfort_hotlist.json')
-      .reply(200, JSON.stringify(['127.0.0.1']));
+      .get('/api/v1/lists/hotlist.json')
+      .reply(
+        200,
+        JSON.stringify([
+          { url: '127.0.0.1', targetList: 'blocklist', timestamp: 0 },
+        ]),
+      );
 
     sandbox.replace(browser, 'runtime', {
       sendMessage: sandbox.stub().rejects(),
diff --git a/app/scripts/migrations/078.js b/app/scripts/migrations/078.js
new file mode 100644
index 000000000..7c4090574
--- /dev/null
+++ b/app/scripts/migrations/078.js
@@ -0,0 +1,38 @@
+import { cloneDeep } from 'lodash';
+import { hasProperty, isObject } from '@metamask/utils';
+
+export const version = 78;
+
+/**
+ * The`@metamask/phishing-controller` state was updated in v2.0.0.
+ *
+ * @param originalVersionedData - Versioned MetaMask extension state, exactly what we persist to dist.
+ * @param originalVersionedData.meta - State metadata.
+ * @param originalVersionedData.meta.version - The current state version.
+ * @param originalVersionedData.data - The persisted MetaMask state, keyed by controller.
+ * @returns Updated versioned MetaMask extension state.
+ */
+export default {
+  version,
+  async migrate(originalVersionedData) {
+    const versionedData = cloneDeep(originalVersionedData);
+    versionedData.meta.version = version;
+    versionedData.data = transformState(versionedData.data);
+    return versionedData;
+  },
+};
+
+function transformState(state) {
+  if (
+    !hasProperty(state, 'PhishingController') ||
+    !isObject(state.PhishingController)
+  ) {
+    return state;
+  }
+  const { PhishingController } = state;
+
+  delete PhishingController.phishing;
+  delete PhishingController.lastFetched;
+
+  return state;
+}
diff --git a/app/scripts/migrations/078.test.js b/app/scripts/migrations/078.test.js
new file mode 100644
index 000000000..fb1c87a0b
--- /dev/null
+++ b/app/scripts/migrations/078.test.js
@@ -0,0 +1,108 @@
+import { migrate, version } from './078';
+
+describe('migration #78', () => {
+  it('updates the version metadata', async () => {
+    const oldStorage = {
+      meta: {
+        version: 77,
+      },
+      data: {},
+    };
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(newStorage.meta).toStrictEqual({
+      version,
+    });
+  });
+
+  it('does not change the state if the phishing controller state does not exist', async () => {
+    const oldStorage = {
+      meta: {
+        version: 77,
+      },
+      data: { test: '123' },
+    };
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(newStorage.data).toStrictEqual(oldStorage.data);
+  });
+
+  const nonObjects = [undefined, null, 'test', 1, ['test']];
+
+  for (const invalidState of nonObjects) {
+    it(`does not change the state if the phishing controller state is ${invalidState}`, async () => {
+      const oldStorage = {
+        meta: {
+          version: 77,
+        },
+        data: { PhishingController: invalidState },
+      };
+
+      const newStorage = await migrate(oldStorage);
+
+      expect(newStorage.data).toStrictEqual(oldStorage.data);
+    });
+  }
+
+  it('does not change the state if the phishing controller state does not include "phishing" or "lastFetched" properties', async () => {
+    const oldStorage = {
+      meta: {
+        version: 77,
+      },
+      data: { PhishingController: { test: '123' } },
+    };
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(newStorage.data).toStrictEqual(oldStorage.data);
+  });
+
+  it('deletes the "phishing" property', async () => {
+    const oldStorage = {
+      meta: {
+        version: 77,
+      },
+      data: { PhishingController: { test: '123', phishing: [] } },
+    };
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(newStorage.data).toStrictEqual({
+      PhishingController: { test: '123' },
+    });
+  });
+
+  it('deletes the "lastFetched" property', async () => {
+    const oldStorage = {
+      meta: {
+        version: 77,
+      },
+      data: { PhishingController: { test: '123', lastFetched: 100 } },
+    };
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(newStorage.data).toStrictEqual({
+      PhishingController: { test: '123' },
+    });
+  });
+
+  it('deletes the "phishing" and "lastFetched" properties', async () => {
+    const oldStorage = {
+      meta: {
+        version: 77,
+      },
+      data: {
+        PhishingController: { test: '123', lastFetched: 100, phishing: [] },
+      },
+    };
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(newStorage.data).toStrictEqual({
+      PhishingController: { test: '123' },
+    });
+  });
+});
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js
index d39595847..d4928f75e 100644
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@@ -81,6 +81,7 @@ import m074 from './074';
 import m075 from './075';
 import m076 from './076';
 import m077 from './077';
+import m078 from './078';
 
 const migrations = [
   m002,
@@ -159,6 +160,7 @@ const migrations = [
   m075,
   m076,
   m077,
+  m078,
 ];
 
 export default migrations;
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index fb29b869d..d71bd89a8 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -1266,7 +1266,7 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils>isomorphic-fetch": true,
         "@metamask/phishing-controller>@metamask/controller-utils": true,
-        "@metamask/phishing-controller>eth-phishing-detect": true,
+        "@metamask/phishing-warning>eth-phishing-detect": true,
         "punycode": true
       }
     },
@@ -1285,7 +1285,7 @@
         "ethjs>ethjs-unit": true
       }
     },
-    "@metamask/phishing-controller>eth-phishing-detect": {
+    "@metamask/phishing-warning>eth-phishing-detect": {
       "packages": {
         "eslint>optionator>fast-levenshtein": true
       }
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index 75fcd2212..62a1a9b39 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -1218,11 +1218,11 @@
           "@metamask/base-controller": true,
           "@metamask/controller-utils": true,
           "@metamask/controller-utils>isomorphic-fetch": true,
-          "@metamask/phishing-controller>eth-phishing-detect": true,
+          "@metamask/phishing-warning>eth-phishing-detect": true,
           "punycode": true
         }
       },
-      "@metamask/phishing-controller>eth-phishing-detect": {
+      "@metamask/phishing-warning>eth-phishing-detect": {
         "packages": {
           "eslint>optionator>fast-levenshtein": true
         }
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 50ea634e9..ba2c51431 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -1278,7 +1278,7 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils>isomorphic-fetch": true,
         "@metamask/phishing-controller>@metamask/controller-utils": true,
-        "@metamask/phishing-controller>eth-phishing-detect": true,
+        "@metamask/phishing-warning>eth-phishing-detect": true,
         "punycode": true
       }
     },
@@ -1297,7 +1297,7 @@
         "ethjs>ethjs-unit": true
       }
     },
-    "@metamask/phishing-controller>eth-phishing-detect": {
+    "@metamask/phishing-warning>eth-phishing-detect": {
       "packages": {
         "eslint>optionator>fast-levenshtein": true
       }
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index fb29b869d..d71bd89a8 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -1266,7 +1266,7 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils>isomorphic-fetch": true,
         "@metamask/phishing-controller>@metamask/controller-utils": true,
-        "@metamask/phishing-controller>eth-phishing-detect": true,
+        "@metamask/phishing-warning>eth-phishing-detect": true,
         "punycode": true
       }
     },
@@ -1285,7 +1285,7 @@
         "ethjs>ethjs-unit": true
       }
     },
-    "@metamask/phishing-controller>eth-phishing-detect": {
+    "@metamask/phishing-warning>eth-phishing-detect": {
       "packages": {
         "eslint>optionator>fast-levenshtein": true
       }
diff --git a/package.json b/package.json
index 9e1cf0818..a4e179b2d 100644
--- a/package.json
+++ b/package.json
@@ -242,7 +242,7 @@
     "@metamask/notification-controller": "^1.0.0",
     "@metamask/obs-store": "^5.0.0",
     "@metamask/permission-controller": "^1.0.0",
-    "@metamask/phishing-controller": "^1.1.2",
+    "@metamask/phishing-controller": "^2.0.0",
     "@metamask/post-message-stream": "^6.0.0",
     "@metamask/providers": "^10.2.1",
     "@metamask/rate-limit-controller": "^1.0.0",
@@ -371,7 +371,7 @@
     "@metamask/eslint-config-nodejs": "^9.0.0",
     "@metamask/eslint-config-typescript": "^9.0.1",
     "@metamask/forwarder": "^1.1.0",
-    "@metamask/phishing-warning": "^1.2.1",
+    "@metamask/phishing-warning": "^2.0.1",
     "@metamask/test-dapp": "^5.4.0",
     "@sentry/cli": "^1.58.0",
     "@storybook/addon-a11y": "^6.5.13",
diff --git a/shared/constants/phishing.js b/shared/constants/phishing.js
deleted file mode 100644
index 63dea3706..000000000
--- a/shared/constants/phishing.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export const PHISHING_NEW_ISSUE_URLS = {
-  MetaMask: 'https://github.com/metamask/eth-phishing-detect/issues/new',
-  PhishFort: 'https://github.com/phishfort/phishfort-lists/issues/new',
-};
diff --git a/test/e2e/mock-e2e.js b/test/e2e/mock-e2e.js
index c043bf570..e6da0333d 100644
--- a/test/e2e/mock-e2e.js
+++ b/test/e2e/mock-e2e.js
@@ -5,6 +5,21 @@ const blacklistedHosts = [
   'sepolia.infura.io',
 ];
 
+const HOTLIST_URL =
+  'https://static.metafi.codefi.network/api/v1/lists/hotlist.json';
+const STALELIST_URL =
+  'https://static.metafi.codefi.network/api/v1/lists/stalelist.json';
+
+const emptyHotlist = [];
+const emptyStalelist = {
+  version: 2,
+  tolerance: 2,
+  fuzzylist: [],
+  allowlist: [],
+  blocklist: [],
+  lastUpdated: 0,
+};
+
 async function setupMocking(server, testSpecificMock) {
   await server.forAnyRequest().thenPassThrough({
     beforeRequest: (req) => {
@@ -341,6 +356,22 @@ async function setupMocking(server, testSpecificMock) {
     });
 
   testSpecificMock(server);
+
+  // Mocks below this line can be overridden by test-specific mocks
+
+  await server.forGet(STALELIST_URL).thenCallback(() => {
+    return {
+      statusCode: 200,
+      json: emptyStalelist,
+    };
+  });
+
+  await server.forGet(HOTLIST_URL).thenCallback(() => {
+    return {
+      statusCode: 200,
+      json: emptyHotlist,
+    };
+  });
 }
 
 module.exports = { setupMocking };
diff --git a/test/e2e/tests/phishing-detection.spec.js b/test/e2e/tests/phishing-detection.spec.js
index 897ad66ac..cc30a5ca0 100644
--- a/test/e2e/tests/phishing-detection.spec.js
+++ b/test/e2e/tests/phishing-detection.spec.js
@@ -2,36 +2,87 @@ const { strict: assert } = require('assert');
 const { convertToHexValue, withFixtures } = require('../helpers');
 const FixtureBuilder = require('../fixture-builder');
 
-const PHISHFORT_CDN_URL =
-  'https://static.metafi.codefi.network/api/v1/lists/phishfort_hotlist.json';
+const STALELIST_URL =
+  'https://static.metafi.codefi.network/api/v1/lists/stalelist.json';
 
-describe('Phishing Detection', function () {
-  async function mockPhishingDetection(mockServer) {
-    await mockServer
-      .forGet(
-        'https://static.metafi.codefi.network/api/v1/lists/eth_phishing_detect_config.json',
-      )
-      .thenCallback(() => {
-        return {
-          statusCode: 200,
-          json: {
-            version: 2,
-            tolerance: 2,
-            fuzzylist: [],
-            whitelist: [],
-            blacklist: ['127.0.0.1'],
-          },
-        };
-      });
-  }
-  async function mockPhishfortPhishingDetection(mockServer) {
-    await mockServer.forGet(PHISHFORT_CDN_URL).thenCallback(() => {
+const emptyHtmlPage = `<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>title</title>
+  </head>
+  <body>
+    Empty page
+  </body>
+</html>`;
+
+/**
+ * Setup fetch mocks for the phishing detection feature.
+ *
+ * The mock configuration will show that "127.0.0.1" is blocked. The dynamic lookup on the warning
+ * page can be customized, so that we can test both the MetaMask and PhishFort block cases.
+ *
+ * @param {import('mockttp').Mockttp} mockServer - The mock server.
+ * @param {object} metamaskPhishingConfigResponse - The response for the dynamic phishing
+ * configuration lookup performed by the warning page.
+ */
+async function setupPhishingDetectionMocks(
+  mockServer,
+  metamaskPhishingConfigResponse,
+) {
+  await mockServer.forGet(STALELIST_URL).thenCallback(() => {
+    return {
+      statusCode: 200,
+      json: {
+        version: 2,
+        tolerance: 2,
+        fuzzylist: [],
+        allowlist: [],
+        blocklist: ['127.0.0.1'],
+        lastUpdated: 0,
+      },
+    };
+  });
+
+  await mockServer
+    .forGet('https://github.com/MetaMask/eth-phishing-detect/issues/new')
+    .thenCallback(() => {
       return {
         statusCode: 200,
-        json: ['127.0.0.1'],
+        body: emptyHtmlPage,
       };
     });
+  await mockServer
+    .forGet('https://github.com/phishfort/phishfort-lists/issues/new')
+    .thenCallback(() => {
+      return {
+        statusCode: 200,
+        body: emptyHtmlPage,
+      };
+    });
+
+  await mockServer
+    .forGet(
+      'https://raw.githubusercontent.com/MetaMask/eth-phishing-detect/master/src/config.json',
+    )
+    .thenCallback(() => metamaskPhishingConfigResponse);
+}
+
+describe('Phishing Detection', function () {
+  function mockPhishingDetection(mockServer) {
+    setupPhishingDetectionMocks(mockServer, {
+      statusCode: 200,
+      json: {
+        version: 2,
+        tolerance: 2,
+        fuzzylist: [],
+        whitelist: [],
+        blacklist: ['127.0.0.1'],
+        lastUpdated: 0,
+      },
+    });
   }
+
   const ganacheOptions = {
     accounts: [
       {
@@ -41,6 +92,7 @@ describe('Phishing Detection', function () {
       },
     ],
   };
+
   it('should display the MetaMask Phishing Detection page and take the user to the blocked page if they continue', async function () {
     await withFixtures(
       {
@@ -57,7 +109,7 @@ describe('Phishing Detection', function () {
         await driver.press('#password', driver.Key.ENTER);
         await driver.openNewPage('http://127.0.0.1:8080');
         await driver.clickElement({
-          text: 'continuing at your own risk',
+          text: 'continue to the site.',
         });
         const header = await driver.findElement('h1');
         assert.equal(await header.getText(), 'E2E Test Dapp');
@@ -93,7 +145,7 @@ describe('Phishing Detection', function () {
         });
         await driver.switchToWindowWithTitle('MetaMask Phishing Detection');
         await driver.clickElement({
-          text: 'continuing at your own risk',
+          text: 'continue to the site.',
         });
         const header = await driver.findElement('h1');
         assert.equal(await header.getText(), 'E2E Test Dapp');
@@ -131,7 +183,7 @@ describe('Phishing Detection', function () {
         });
         await driver.switchToWindowWithTitle('MetaMask Phishing Detection');
         await driver.clickElement({
-          text: 'continuing at your own risk',
+          text: 'continue to the site.',
         });
 
         // Ensure we're not on the wallet home page
@@ -140,13 +192,15 @@ describe('Phishing Detection', function () {
     );
   });
 
-  it('should display the MetaMask Phishing Detection page with the correct new issue link if the issue was detected from the phishfort list', async function () {
+  it('should navigate the user to eth-phishing-detect to dispute a block if the phishing warning page fails to identify the source', async function () {
     await withFixtures(
       {
         fixtures: new FixtureBuilder().build(),
         ganacheOptions,
         title: this.test.title,
-        testSpecificMock: mockPhishfortPhishingDetection,
+        testSpecificMock: (mockServer) => {
+          setupPhishingDetectionMocks(mockServer, { statusCode: 500 });
+        },
         dapp: true,
         failOnConsoleError: false,
       },
@@ -155,10 +209,83 @@ describe('Phishing Detection', function () {
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
         await driver.openNewPage('http://127.0.0.1:8080');
-        const newIssueLink = await driver.findElements(
-          "a[href='https://github.com/phishfort/phishfort-lists/issues/new?title=[Legitimate%20Site%20Blocked]%20127.0.0.1&body=http%3A%2F%2F127.0.0.1%3A8080%2F']",
+
+        await driver.clickElement({ text: 'report a detection problem.' });
+
+        // wait for page to load before checking URL.
+        await driver.findElement({ text: 'Empty page' });
+        assert.equal(
+          await driver.getCurrentUrl(),
+          `https://github.com/MetaMask/eth-phishing-detect/issues/new?title=[Legitimate%20Site%20Blocked]%20127.0.0.1&body=http%3A%2F%2F127.0.0.1%3A8080%2F`,
+        );
+      },
+    );
+  });
+
+  it('should navigate the user to eth-phishing-detect to dispute a block from MetaMask', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().build(),
+        ganacheOptions,
+        title: this.test.title,
+        testSpecificMock: mockPhishingDetection,
+        dapp: true,
+        failOnConsoleError: false,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+        await driver.fill('#password', 'correct horse battery staple');
+        await driver.press('#password', driver.Key.ENTER);
+        await driver.openNewPage('http://127.0.0.1:8080');
+
+        await driver.clickElement({ text: 'report a detection problem.' });
+
+        // wait for page to load before checking URL.
+        await driver.findElement({ text: 'Empty page' });
+        assert.equal(
+          await driver.getCurrentUrl(),
+          `https://github.com/MetaMask/eth-phishing-detect/issues/new?title=[Legitimate%20Site%20Blocked]%20127.0.0.1&body=http%3A%2F%2F127.0.0.1%3A8080%2F`,
+        );
+      },
+    );
+  });
+
+  it('should navigate the user to PhishFort to dispute a block from MetaMask', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().build(),
+        ganacheOptions,
+        title: this.test.title,
+        testSpecificMock: (mockServer) => {
+          setupPhishingDetectionMocks(mockServer, {
+            statusCode: 200,
+            json: {
+              version: 2,
+              tolerance: 2,
+              fuzzylist: [],
+              whitelist: [],
+              blacklist: [],
+              lastUpdated: 0,
+            },
+          });
+        },
+        dapp: true,
+        failOnConsoleError: false,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+        await driver.fill('#password', 'correct horse battery staple');
+        await driver.press('#password', driver.Key.ENTER);
+        await driver.openNewPage('http://127.0.0.1:8080');
+
+        await driver.clickElement({ text: 'report a detection problem.' });
+
+        // wait for page to load before checking URL.
+        await driver.findElement({ text: 'Empty page' });
+        assert.equal(
+          await driver.getCurrentUrl(),
+          `https://github.com/phishfort/phishfort-lists/issues/new?title=[Legitimate%20Site%20Blocked]%20127.0.0.1&body=http%3A%2F%2F127.0.0.1%3A8080%2F`,
         );
-        assert.equal(newIssueLink.length, 1);
       },
     );
   });
diff --git a/yarn.lock b/yarn.lock
index 4b20541e2..1936a9513 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4015,9 +4015,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/phishing-controller@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "@metamask/phishing-controller@npm:1.1.2"
+"@metamask/phishing-controller@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@metamask/phishing-controller@npm:2.0.0"
   dependencies:
     "@metamask/base-controller": ^1.1.2
     "@metamask/controller-utils": ^2.0.0
@@ -4025,31 +4025,24 @@ __metadata:
     eth-phishing-detect: ^1.2.0
     isomorphic-fetch: ^3.0.0
     punycode: ^2.1.1
-  checksum: a85427c5c0adab2651c9fb0207cae9501597b820d0807c35177615533bba2626a4c2458b4863f0bef987cc5dfbd523d70a60d3c48bd332ebc8bd6b5a8f640c4e
+  checksum: 8ad20a7cdac8fc5f450bb157d19b0b780d82490571f4d33e1afde871ace078cf4f885e2e5be4abc6e1e551986d5f44a3200b076d5545764f5492dfaf005419e4
   languageName: node
   linkType: hard
 
-"@metamask/phishing-warning@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "@metamask/phishing-warning@npm:1.2.1"
+"@metamask/phishing-warning@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@metamask/phishing-warning@npm:2.0.1"
   dependencies:
     "@metamask/design-tokens": ^1.6.0
-    "@metamask/post-message-stream": ^5.1.0
+    "@metamask/post-message-stream": ^6.0.0
+    "@types/punycode": ^2.1.0
+    eth-phishing-detect: ^1.2.0
     globalthis: 1.0.1
     obj-multiplex: ^1.0.0
     pump: ^3.0.0
-    ses: 0.12.4
-  checksum: 5cdf2f5fb12dbf774c6d54670051ecd02c489f3f0a5ae68a3facbb2135347be3fe308e260fb44e1a34310fe20cb8e26c3b7b0a3addfdd70ca26ff6ba22f22d92
-  languageName: node
-  linkType: hard
-
-"@metamask/post-message-stream@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "@metamask/post-message-stream@npm:5.1.0"
-  dependencies:
-    "@metamask/utils": ^2.0.0
-    readable-stream: 2.3.3
-  checksum: d6c66d82b94970a0689f2d78e4011b891a48edb0f397b54d657c10506cfc066298f3198203a6e8ec090ba87705d62c0db5ba409fede209e1612c8028160059da
+    punycode: ^2.1.1
+    ses: ^0.18.1
+  checksum: caa3e596c3a67188e457307b43724c89121d60734353922d369932093f8618f96465ba7613b194dc2c57754399783dcdf1777c900afeff21bd5137f02688b686
   languageName: node
   linkType: hard
 
@@ -4286,15 +4279,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/utils@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "@metamask/utils@npm:2.1.0"
-  dependencies:
-    fast-deep-equal: ^3.1.3
-  checksum: 50970fe28cbf98fbc34fb4f69d9bc90f5db94929c69ab532f57b48f42163ea77fb080ab31854efd984361c3e29e67831a78d94d1211ac3bcc6b9557769c73127
-  languageName: node
-  linkType: hard
-
 "@metamask/utils@npm:^3.0.1, @metamask/utils@npm:^3.0.3, @metamask/utils@npm:^3.3.0, @metamask/utils@npm:^3.3.1, @metamask/utils@npm:^3.4.0, @metamask/utils@npm:^3.4.1":
   version: 3.4.1
   resolution: "@metamask/utils@npm:3.4.1"
@@ -24197,8 +24181,8 @@ __metadata:
     "@metamask/notification-controller": ^1.0.0
     "@metamask/obs-store": ^5.0.0
     "@metamask/permission-controller": ^1.0.0
-    "@metamask/phishing-controller": ^1.1.2
-    "@metamask/phishing-warning": ^1.2.1
+    "@metamask/phishing-controller": ^2.0.0
+    "@metamask/phishing-warning": ^2.0.1
     "@metamask/post-message-stream": ^6.0.0
     "@metamask/providers": ^10.2.1
     "@metamask/rate-limit-controller": ^1.0.0
@@ -30872,7 +30856,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ses@npm:0.12.4, ses@npm:^0.12.4":
+"ses@npm:^0.12.4":
   version: 0.12.4
   resolution: "ses@npm:0.12.4"
   dependencies:

From 64d8f359daeee5647fcba2621865888a34e4eee9 Mon Sep 17 00:00:00 2001
From: PeterYinusa <peter.yinusa@consensys.net>
Date: Mon, 6 Mar 2023 18:53:30 +0000
Subject: [PATCH 22/36] Update the PhishingController to v2 tests

---
 app/scripts/migrations/078.test.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/scripts/migrations/078.test.js b/app/scripts/migrations/078.test.js
index fb1c87a0b..45b0789f0 100644
--- a/app/scripts/migrations/078.test.js
+++ b/app/scripts/migrations/078.test.js
@@ -1,4 +1,4 @@
-import { migrate, version } from './078';
+import migration78 from './078';
 
 describe('migration #78', () => {
   it('updates the version metadata', async () => {
@@ -9,10 +9,10 @@ describe('migration #78', () => {
       data: {},
     };
 
-    const newStorage = await migrate(oldStorage);
+    const newStorage = await migration78.migrate(oldStorage);
 
     expect(newStorage.meta).toStrictEqual({
-      version,
+      version: 78,
     });
   });
 
@@ -24,7 +24,7 @@ describe('migration #78', () => {
       data: { test: '123' },
     };
 
-    const newStorage = await migrate(oldStorage);
+    const newStorage = await migration78.migrate(oldStorage);
 
     expect(newStorage.data).toStrictEqual(oldStorage.data);
   });
@@ -40,7 +40,7 @@ describe('migration #78', () => {
         data: { PhishingController: invalidState },
       };
 
-      const newStorage = await migrate(oldStorage);
+      const newStorage = await migration78.migrate(oldStorage);
 
       expect(newStorage.data).toStrictEqual(oldStorage.data);
     });
@@ -54,7 +54,7 @@ describe('migration #78', () => {
       data: { PhishingController: { test: '123' } },
     };
 
-    const newStorage = await migrate(oldStorage);
+    const newStorage = await migration78.migrate(oldStorage);
 
     expect(newStorage.data).toStrictEqual(oldStorage.data);
   });
@@ -67,7 +67,7 @@ describe('migration #78', () => {
       data: { PhishingController: { test: '123', phishing: [] } },
     };
 
-    const newStorage = await migrate(oldStorage);
+    const newStorage = await migration78.migrate(oldStorage);
 
     expect(newStorage.data).toStrictEqual({
       PhishingController: { test: '123' },
@@ -82,7 +82,7 @@ describe('migration #78', () => {
       data: { PhishingController: { test: '123', lastFetched: 100 } },
     };
 
-    const newStorage = await migrate(oldStorage);
+    const newStorage = await migration78.migrate(oldStorage);
 
     expect(newStorage.data).toStrictEqual({
       PhishingController: { test: '123' },
@@ -99,7 +99,7 @@ describe('migration #78', () => {
       },
     };
 
-    const newStorage = await migrate(oldStorage);
+    const newStorage = await migration78.migrate(oldStorage);
 
     expect(newStorage.data).toStrictEqual({
       PhishingController: { test: '123' },

From b5321c8b4f286ea26d1cadd13ddb810e5de5f408 Mon Sep 17 00:00:00 2001
From: PeterYinusa <peter.yinusa@consensys.net>
Date: Mon, 6 Mar 2023 19:16:30 +0000
Subject: [PATCH 23/36] bump test coverage

---
 coverage-targets.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/coverage-targets.js b/coverage-targets.js
index ada91d29a..d5bce3b6f 100644
--- a/coverage-targets.js
+++ b/coverage-targets.js
@@ -6,9 +6,9 @@
 // subset of files to check against these targets.
 module.exports = {
   global: {
-    lines: 62.25,
-    branches: 50.5,
-    statements: 61.5,
+    lines: 63,
+    branches: 51,
+    statements: 62,
     functions: 55,
   },
   transforms: {

From 7586d1c3066453bd07d230d84d3e0a8a1b99c05b Mon Sep 17 00:00:00 2001
From: seaona <mariona@gmx.es>
Date: Tue, 7 Mar 2023 12:24:41 +0100
Subject: [PATCH 24/36] Policy updates

---
 lavamoat/browserify/desktop/policy.json | 9254 ++++++++++++-----------
 1 file changed, 4643 insertions(+), 4611 deletions(-)

diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index 62a1a9b39..ba2c51431 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -1,4614 +1,4646 @@
 {
-    "resources": {
-      "@babel/runtime": {
-        "globals": {
-          "regeneratorRuntime": "write"
-        }
-      },
-      "@download/blockies": {
-        "globals": {
-          "document.createElement": true
-        }
-      },
-      "@ensdomains/content-hash": {
-        "globals": {
-          "console.warn": true
-        },
-        "packages": {
-          "@ensdomains/content-hash>cids": true,
-          "@ensdomains/content-hash>js-base64": true,
-          "@ensdomains/content-hash>multicodec": true,
-          "@ensdomains/content-hash>multihashes": true,
-          "browserify>buffer": true
-        }
-      },
-      "@ensdomains/content-hash>cids": {
-        "packages": {
-          "@ensdomains/content-hash>cids>multibase": true,
-          "@ensdomains/content-hash>cids>multicodec": true,
-          "@ensdomains/content-hash>cids>multihashes": true,
-          "@ensdomains/content-hash>cids>uint8arrays": true
-        }
-      },
-      "@ensdomains/content-hash>cids>multibase": {
-        "globals": {
-          "TextDecoder": true,
-          "TextEncoder": true
-        },
-        "packages": {
-          "@ensdomains/content-hash>cids>multibase>@multiformats/base-x": true
-        }
-      },
-      "@ensdomains/content-hash>cids>multicodec": {
-        "packages": {
-          "@ensdomains/content-hash>cids>multicodec>varint": true,
-          "@ensdomains/content-hash>cids>uint8arrays": true
-        }
-      },
-      "@ensdomains/content-hash>cids>multihashes": {
-        "packages": {
-          "@ensdomains/content-hash>cids>multibase": true,
-          "@ensdomains/content-hash>cids>uint8arrays": true,
-          "@ensdomains/content-hash>multihashes>varint": true
-        }
-      },
-      "@ensdomains/content-hash>cids>uint8arrays": {
-        "globals": {
-          "TextDecoder": true,
-          "TextEncoder": true
-        },
-        "packages": {
-          "@ensdomains/content-hash>cids>multibase": true
-        }
-      },
-      "@ensdomains/content-hash>js-base64": {
-        "globals": {
-          "Base64": "write",
-          "TextDecoder": true,
-          "TextEncoder": true,
-          "atob": true,
-          "btoa": true,
-          "define": true
-        },
-        "packages": {
-          "browserify>buffer": true
-        }
-      },
-      "@ensdomains/content-hash>multicodec": {
-        "packages": {
-          "@ensdomains/content-hash>multicodec>uint8arrays": true,
-          "@ensdomains/content-hash>multicodec>varint": true
-        }
-      },
-      "@ensdomains/content-hash>multicodec>uint8arrays": {
-        "packages": {
-          "@ensdomains/content-hash>multicodec>uint8arrays>multibase": true,
-          "@ensdomains/content-hash>multihashes>web-encoding": true
-        }
-      },
-      "@ensdomains/content-hash>multicodec>uint8arrays>multibase": {
-        "packages": {
-          "@ensdomains/content-hash>cids>multibase>@multiformats/base-x": true,
-          "@ensdomains/content-hash>multihashes>web-encoding": true
-        }
-      },
-      "@ensdomains/content-hash>multihashes": {
-        "packages": {
-          "@ensdomains/content-hash>multihashes>multibase": true,
-          "@ensdomains/content-hash>multihashes>varint": true,
-          "@ensdomains/content-hash>multihashes>web-encoding": true,
-          "browserify>buffer": true
-        }
-      },
-      "@ensdomains/content-hash>multihashes>multibase": {
-        "packages": {
-          "@ensdomains/content-hash>multihashes>web-encoding": true,
-          "browserify>buffer": true,
-          "ethereumjs-wallet>bs58check>bs58>base-x": true
-        }
-      },
-      "@ensdomains/content-hash>multihashes>web-encoding": {
-        "globals": {
-          "TextDecoder": true,
-          "TextEncoder": true
-        },
-        "packages": {
-          "browserify>util": true
-        }
-      },
-      "@ethereumjs/common": {
-        "packages": {
-          "@ethereumjs/common>crc-32": true,
-          "browserify>buffer": true,
-          "browserify>events": true,
-          "ethereumjs-util": true
-        }
-      },
-      "@ethereumjs/common>crc-32": {
-        "globals": {
-          "DO_NOT_EXPORT_CRC": true,
-          "define": true
-        }
-      },
-      "@ethereumjs/tx": {
-        "packages": {
-          "@ethereumjs/common": true,
-          "browserify>buffer": true,
-          "browserify>insert-module-globals>is-buffer": true,
-          "ethereumjs-util": true
-        }
-      },
-      "@ethersproject/abi": {
-        "globals": {
-          "console.log": true
-        },
-        "packages": {
-          "@ethersproject/abi>@ethersproject/address": true,
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/abi>@ethersproject/constants": true,
-          "@ethersproject/abi>@ethersproject/hash": true,
-          "@ethersproject/abi>@ethersproject/keccak256": true,
-          "@ethersproject/abi>@ethersproject/logger": true,
-          "@ethersproject/abi>@ethersproject/properties": true,
-          "@ethersproject/abi>@ethersproject/strings": true,
-          "@ethersproject/bignumber": true
-        }
-      },
-      "@ethersproject/abi>@ethersproject/address": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/abi>@ethersproject/keccak256": true,
-          "@ethersproject/abi>@ethersproject/logger": true,
-          "@ethersproject/bignumber": true,
-          "@ethersproject/providers>@ethersproject/rlp": true
-        }
-      },
-      "@ethersproject/abi>@ethersproject/bytes": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/logger": true
-        }
-      },
-      "@ethersproject/abi>@ethersproject/constants": {
-        "packages": {
-          "@ethersproject/bignumber": true
-        }
-      },
-      "@ethersproject/abi>@ethersproject/hash": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/address": true,
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/abi>@ethersproject/keccak256": true,
-          "@ethersproject/abi>@ethersproject/logger": true,
-          "@ethersproject/abi>@ethersproject/properties": true,
-          "@ethersproject/abi>@ethersproject/strings": true,
-          "@ethersproject/bignumber": true,
-          "@ethersproject/providers>@ethersproject/base64": true
-        }
-      },
-      "@ethersproject/abi>@ethersproject/keccak256": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/abi>@ethersproject/keccak256>js-sha3": true
-        }
-      },
-      "@ethersproject/abi>@ethersproject/keccak256>js-sha3": {
-        "globals": {
-          "define": true
-        },
-        "packages": {
-          "browserify>process": true
-        }
-      },
-      "@ethersproject/abi>@ethersproject/logger": {
-        "globals": {
-          "console": true
-        }
-      },
-      "@ethersproject/abi>@ethersproject/properties": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/logger": true
-        }
-      },
-      "@ethersproject/abi>@ethersproject/strings": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/abi>@ethersproject/constants": true,
-          "@ethersproject/abi>@ethersproject/logger": true
-        }
-      },
-      "@ethersproject/bignumber": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/abi>@ethersproject/logger": true,
-          "@ethersproject/bignumber>bn.js": true
-        }
-      },
-      "@ethersproject/bignumber>bn.js": {
-        "globals": {
-          "Buffer": true
-        },
-        "packages": {
-          "browserify>browser-resolve": true
-        }
-      },
-      "@ethersproject/contracts": {
-        "globals": {
-          "setTimeout": true
-        },
-        "packages": {
-          "@ethersproject/abi": true,
-          "@ethersproject/abi>@ethersproject/address": true,
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/abi>@ethersproject/logger": true,
-          "@ethersproject/abi>@ethersproject/properties": true,
-          "@ethersproject/bignumber": true,
-          "@ethersproject/hdnode>@ethersproject/abstract-signer": true,
-          "@ethersproject/hdnode>@ethersproject/transactions": true,
-          "@ethersproject/providers>@ethersproject/abstract-provider": true
-        }
-      },
-      "@ethersproject/hdnode": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/abi>@ethersproject/logger": true,
-          "@ethersproject/abi>@ethersproject/properties": true,
-          "@ethersproject/abi>@ethersproject/strings": true,
-          "@ethersproject/bignumber": true,
-          "@ethersproject/hdnode>@ethersproject/basex": true,
-          "@ethersproject/hdnode>@ethersproject/pbkdf2": true,
-          "@ethersproject/hdnode>@ethersproject/sha2": true,
-          "@ethersproject/hdnode>@ethersproject/signing-key": true,
-          "@ethersproject/hdnode>@ethersproject/transactions": true,
-          "@ethersproject/hdnode>@ethersproject/wordlists": true
-        }
-      },
-      "@ethersproject/hdnode>@ethersproject/abstract-signer": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/logger": true,
-          "@ethersproject/abi>@ethersproject/properties": true
-        }
-      },
-      "@ethersproject/hdnode>@ethersproject/basex": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/abi>@ethersproject/properties": true
-        }
-      },
-      "@ethersproject/hdnode>@ethersproject/pbkdf2": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/hdnode>@ethersproject/sha2": true
-        }
-      },
-      "@ethersproject/hdnode>@ethersproject/sha2": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/abi>@ethersproject/logger": true,
-          "ethereumjs-util>ethereum-cryptography>hash.js": true
-        }
-      },
-      "@ethersproject/hdnode>@ethersproject/signing-key": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/abi>@ethersproject/logger": true,
-          "@ethersproject/abi>@ethersproject/properties": true,
-          "ganache>secp256k1>elliptic": true
-        }
-      },
-      "@ethersproject/hdnode>@ethersproject/transactions": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/address": true,
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/abi>@ethersproject/constants": true,
-          "@ethersproject/abi>@ethersproject/keccak256": true,
-          "@ethersproject/abi>@ethersproject/logger": true,
-          "@ethersproject/abi>@ethersproject/properties": true,
-          "@ethersproject/bignumber": true,
-          "@ethersproject/hdnode>@ethersproject/signing-key": true,
-          "@ethersproject/providers>@ethersproject/rlp": true
-        }
-      },
-      "@ethersproject/hdnode>@ethersproject/wordlists": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/abi>@ethersproject/hash": true,
-          "@ethersproject/abi>@ethersproject/logger": true,
-          "@ethersproject/abi>@ethersproject/properties": true,
-          "@ethersproject/abi>@ethersproject/strings": true
-        }
-      },
-      "@ethersproject/providers": {
-        "globals": {
-          "WebSocket": true,
-          "clearInterval": true,
-          "clearTimeout": true,
-          "console.log": true,
-          "console.warn": true,
-          "setInterval": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "@ethersproject/abi>@ethersproject/address": true,
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/abi>@ethersproject/constants": true,
-          "@ethersproject/abi>@ethersproject/hash": true,
-          "@ethersproject/abi>@ethersproject/logger": true,
-          "@ethersproject/abi>@ethersproject/properties": true,
-          "@ethersproject/abi>@ethersproject/strings": true,
-          "@ethersproject/bignumber": true,
-          "@ethersproject/hdnode>@ethersproject/abstract-signer": true,
-          "@ethersproject/hdnode>@ethersproject/basex": true,
-          "@ethersproject/hdnode>@ethersproject/sha2": true,
-          "@ethersproject/hdnode>@ethersproject/transactions": true,
-          "@ethersproject/providers>@ethersproject/abstract-provider": true,
-          "@ethersproject/providers>@ethersproject/base64": true,
-          "@ethersproject/providers>@ethersproject/networks": true,
-          "@ethersproject/providers>@ethersproject/random": true,
-          "@ethersproject/providers>@ethersproject/web": true,
-          "@ethersproject/providers>bech32": true
-        }
-      },
-      "@ethersproject/providers>@ethersproject/abstract-provider": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/abi>@ethersproject/logger": true,
-          "@ethersproject/abi>@ethersproject/properties": true,
-          "@ethersproject/bignumber": true
-        }
-      },
-      "@ethersproject/providers>@ethersproject/base64": {
-        "globals": {
-          "atob": true,
-          "btoa": true
-        },
-        "packages": {
-          "@ethersproject/abi>@ethersproject/bytes": true
-        }
-      },
-      "@ethersproject/providers>@ethersproject/networks": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/logger": true
-        }
-      },
-      "@ethersproject/providers>@ethersproject/random": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/abi>@ethersproject/logger": true
-        }
-      },
-      "@ethersproject/providers>@ethersproject/rlp": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/abi>@ethersproject/logger": true
-        }
-      },
-      "@ethersproject/providers>@ethersproject/web": {
-        "globals": {
-          "clearTimeout": true,
-          "fetch": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/abi>@ethersproject/logger": true,
-          "@ethersproject/abi>@ethersproject/properties": true,
-          "@ethersproject/abi>@ethersproject/strings": true,
-          "@ethersproject/providers>@ethersproject/base64": true
-        }
-      },
-      "@formatjs/intl-relativetimeformat": {
-        "globals": {
-          "Intl": true
-        },
-        "packages": {
-          "@formatjs/intl-relativetimeformat>@formatjs/intl-utils": true
-        }
-      },
-      "@formatjs/intl-relativetimeformat>@formatjs/intl-utils": {
-        "globals": {
-          "Intl.getCanonicalLocales": true
-        }
-      },
-      "@keystonehq/bc-ur-registry-eth": {
-        "packages": {
-          "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true,
-          "@keystonehq/bc-ur-registry-eth>hdkey": true,
-          "browserify>buffer": true,
-          "eth-lattice-keyring>@ethereumjs/util": true,
-          "uuid": true
-        }
-      },
-      "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": {
-        "globals": {
-          "define": true
-        },
-        "packages": {
-          "@ngraveio/bc-ur": true,
-          "browserify>buffer": true,
-          "enzyme>cheerio>tslib": true,
-          "ethereumjs-wallet>bs58check": true
-        }
-      },
-      "@keystonehq/bc-ur-registry-eth>hdkey": {
-        "packages": {
-          "browserify>assert": true,
-          "browserify>crypto-browserify": true,
-          "ethereumjs-util>ethereum-cryptography>secp256k1": true,
-          "ethereumjs-wallet>bs58check": true,
-          "ethereumjs-wallet>safe-buffer": true
-        }
-      },
-      "@keystonehq/metamask-airgapped-keyring": {
-        "packages": {
-          "@ethereumjs/tx": true,
-          "@keystonehq/bc-ur-registry-eth": true,
-          "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": true,
-          "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store": true,
-          "browserify>buffer": true,
-          "browserify>events": true,
-          "ethereumjs-util>rlp": true,
-          "uuid": true
-        }
-      },
-      "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": {
-        "packages": {
-          "@ethereumjs/tx": true,
-          "@keystonehq/bc-ur-registry-eth": true,
-          "@keystonehq/bc-ur-registry-eth>hdkey": true,
-          "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": true,
-          "browserify>buffer": true,
-          "eth-lattice-keyring>@ethereumjs/util": true,
-          "uuid": true
-        }
-      },
-      "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": {
-        "globals": {
-          "TextEncoder": true
-        }
-      },
-      "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store": {
-        "packages": {
-          "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2": true,
-          "browserify>stream-browserify": true,
-          "json-rpc-engine>@metamask/safe-event-emitter": true
-        }
-      },
-      "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2": {
-        "packages": {
-          "browserify>process": true,
-          "browserify>util": true,
-          "readable-stream": true,
-          "watchify>xtend": true
-        }
-      },
-      "@material-ui/core": {
-        "globals": {
-          "Image": true,
-          "_formatMuiErrorMessage": true,
-          "addEventListener": true,
-          "clearInterval": true,
-          "clearTimeout": true,
-          "console.error": true,
-          "console.warn": true,
-          "document": true,
-          "getComputedStyle": true,
-          "getSelection": true,
-          "innerHeight": true,
-          "innerWidth": true,
-          "matchMedia": true,
-          "navigator": true,
-          "performance.now": true,
-          "removeEventListener": true,
-          "requestAnimationFrame": true,
-          "setInterval": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "@babel/runtime": true,
-          "@material-ui/core>@material-ui/styles": true,
-          "@material-ui/core>@material-ui/system": true,
-          "@material-ui/core>@material-ui/utils": true,
-          "@material-ui/core>clsx": true,
-          "@material-ui/core>popper.js": true,
-          "@material-ui/core>react-transition-group": true,
-          "prop-types": true,
-          "prop-types>react-is": true,
-          "react": true,
-          "react-dom": true,
-          "react-redux>hoist-non-react-statics": true
-        }
-      },
-      "@material-ui/core>@material-ui/styles": {
-        "globals": {
-          "console.error": true,
-          "console.warn": true,
-          "document.createComment": true,
-          "document.head": true
-        },
-        "packages": {
-          "@babel/runtime": true,
-          "@material-ui/core>@material-ui/styles>jss": true,
-          "@material-ui/core>@material-ui/styles>jss-plugin-camel-case": true,
-          "@material-ui/core>@material-ui/styles>jss-plugin-default-unit": true,
-          "@material-ui/core>@material-ui/styles>jss-plugin-global": true,
-          "@material-ui/core>@material-ui/styles>jss-plugin-nested": true,
-          "@material-ui/core>@material-ui/styles>jss-plugin-props-sort": true,
-          "@material-ui/core>@material-ui/styles>jss-plugin-rule-value-function": true,
-          "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer": true,
-          "@material-ui/core>@material-ui/utils": true,
-          "@material-ui/core>clsx": true,
-          "prop-types": true,
-          "react": true,
-          "react-redux>hoist-non-react-statics": true
-        }
-      },
-      "@material-ui/core>@material-ui/styles>jss": {
-        "globals": {
-          "CSS": true,
-          "document.createElement": true,
-          "document.querySelector": true
-        },
-        "packages": {
-          "@babel/runtime": true,
-          "@material-ui/core>@material-ui/styles>jss>is-in-browser": true,
-          "react-router-dom>tiny-warning": true
-        }
-      },
-      "@material-ui/core>@material-ui/styles>jss-plugin-camel-case": {
-        "packages": {
-          "@material-ui/core>@material-ui/styles>jss-plugin-camel-case>hyphenate-style-name": true
-        }
-      },
-      "@material-ui/core>@material-ui/styles>jss-plugin-default-unit": {
-        "globals": {
-          "CSS": true
-        },
-        "packages": {
-          "@material-ui/core>@material-ui/styles>jss": true
-        }
-      },
-      "@material-ui/core>@material-ui/styles>jss-plugin-global": {
-        "packages": {
-          "@babel/runtime": true,
-          "@material-ui/core>@material-ui/styles>jss": true
-        }
-      },
-      "@material-ui/core>@material-ui/styles>jss-plugin-nested": {
-        "packages": {
-          "@babel/runtime": true,
-          "react-router-dom>tiny-warning": true
-        }
-      },
-      "@material-ui/core>@material-ui/styles>jss-plugin-rule-value-function": {
-        "packages": {
-          "@material-ui/core>@material-ui/styles>jss": true,
-          "react-router-dom>tiny-warning": true
-        }
-      },
-      "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer": {
-        "packages": {
-          "@material-ui/core>@material-ui/styles>jss": true,
-          "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer>css-vendor": true
-        }
-      },
-      "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer>css-vendor": {
-        "globals": {
-          "document.createElement": true,
-          "document.documentElement": true,
-          "getComputedStyle": true
-        },
-        "packages": {
-          "@babel/runtime": true,
-          "@material-ui/core>@material-ui/styles>jss>is-in-browser": true
-        }
-      },
-      "@material-ui/core>@material-ui/styles>jss>is-in-browser": {
-        "globals": {
-          "document": true
-        }
-      },
-      "@material-ui/core>@material-ui/system": {
-        "globals": {
-          "console.error": true
-        },
-        "packages": {
-          "@babel/runtime": true,
-          "@material-ui/core>@material-ui/utils": true,
-          "prop-types": true
-        }
-      },
-      "@material-ui/core>@material-ui/utils": {
-        "packages": {
-          "@babel/runtime": true,
-          "prop-types": true,
-          "prop-types>react-is": true
-        }
-      },
-      "@material-ui/core>popper.js": {
-        "globals": {
-          "MSInputMethodContext": true,
-          "Node.DOCUMENT_POSITION_FOLLOWING": true,
-          "cancelAnimationFrame": true,
-          "console.warn": true,
-          "define": true,
-          "devicePixelRatio": true,
-          "document": true,
-          "getComputedStyle": true,
-          "innerHeight": true,
-          "innerWidth": true,
-          "navigator": true,
-          "requestAnimationFrame": true,
-          "setTimeout": true
-        }
-      },
-      "@material-ui/core>react-transition-group": {
-        "globals": {
-          "Element": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "@material-ui/core>react-transition-group>dom-helpers": true,
-          "prop-types": true,
-          "react": true,
-          "react-dom": true
-        }
-      },
-      "@material-ui/core>react-transition-group>dom-helpers": {
-        "packages": {
-          "@babel/runtime": true
-        }
-      },
-      "@metamask/address-book-controller": {
-        "packages": {
-          "@metamask/address-book-controller>@metamask/base-controller": true,
-          "@metamask/controller-utils": true
-        }
-      },
-      "@metamask/address-book-controller>@metamask/base-controller": {
-        "packages": {
-          "immer": true
-        }
-      },
-      "@metamask/announcement-controller": {
-        "packages": {
-          "@metamask/announcement-controller>@metamask/base-controller": true
-        }
-      },
-      "@metamask/announcement-controller>@metamask/base-controller": {
-        "packages": {
-          "immer": true
-        }
-      },
-      "@metamask/approval-controller": {
-        "packages": {
-          "@metamask/approval-controller>nanoid": true,
-          "@metamask/base-controller": true,
-          "eth-rpc-errors": true
-        }
-      },
-      "@metamask/approval-controller>nanoid": {
-        "globals": {
-          "crypto.getRandomValues": true
-        }
-      },
-      "@metamask/assets-controllers": {
-        "globals": {
-          "Headers": true,
-          "URL": true,
-          "clearInterval": true,
-          "clearTimeout": true,
-          "console.info": true,
-          "console.log": true,
-          "setInterval": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "@ethersproject/abi": true,
-          "@ethersproject/contracts": true,
-          "@ethersproject/providers": true,
-          "@metamask/assets-controllers>abort-controller": true,
-          "@metamask/assets-controllers>multiformats": true,
-          "@metamask/base-controller": true,
-          "@metamask/contract-metadata": true,
-          "@metamask/controller-utils": true,
-          "@metamask/metamask-eth-abis": true,
-          "browserify>events": true,
-          "eth-json-rpc-filters>async-mutex": true,
-          "eth-query": true,
-          "eth-rpc-errors": true,
-          "ethereumjs-util": true,
-          "single-call-balance-checker-abi": true,
-          "uuid": true
-        }
-      },
-      "@metamask/assets-controllers>abort-controller": {
-        "globals": {
-          "AbortController": true
-        }
-      },
-      "@metamask/assets-controllers>multiformats": {
-        "globals": {
-          "TextDecoder": true,
-          "TextEncoder": true,
-          "console.warn": true
-        }
-      },
-      "@metamask/base-controller": {
-        "packages": {
-          "immer": true
-        }
-      },
-      "@metamask/controller-utils": {
-        "globals": {
-          "console.error": true,
-          "fetch": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "@metamask/controller-utils>isomorphic-fetch": true,
-          "browserify>buffer": true,
-          "eslint>fast-deep-equal": true,
-          "eth-ens-namehash": true,
-          "ethereumjs-util": true,
-          "ethjs>ethjs-unit": true
-        }
-      },
-      "@metamask/controller-utils>isomorphic-fetch": {
-        "globals": {
-          "fetch.bind": true
-        },
-        "packages": {
-          "@metamask/controller-utils>isomorphic-fetch>whatwg-fetch": true
-        }
-      },
-      "@metamask/controller-utils>isomorphic-fetch>whatwg-fetch": {
-        "globals": {
-          "Blob": true,
-          "FileReader": true,
-          "FormData": true,
-          "URLSearchParams.prototype.isPrototypeOf": true,
-          "XMLHttpRequest": true,
-          "define": true,
-          "setTimeout": true
-        }
-      },
-      "@metamask/controllers>nanoid": {
-        "globals": {
-          "crypto.getRandomValues": true
-        }
-      },
-      "@metamask/controllers>web3": {
-        "globals": {
-          "XMLHttpRequest": true
-        }
-      },
-      "@metamask/controllers>web3-provider-engine>cross-fetch>node-fetch": {
-        "globals": {
-          "fetch": true
-        }
-      },
-      "@metamask/controllers>web3-provider-engine>eth-json-rpc-middleware>node-fetch": {
-        "globals": {
-          "fetch": true
-        }
-      },
-      "@metamask/eth-json-rpc-infura": {
-        "globals": {
-          "setTimeout": true
-        },
-        "packages": {
-          "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": true,
-          "@metamask/utils": true,
-          "eth-rpc-errors": true,
-          "json-rpc-engine": true,
-          "node-fetch": true
-        }
-      },
-      "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": {
-        "globals": {
-          "URL": true,
-          "btoa": true,
-          "console.error": true,
-          "fetch": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util": true,
-          "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>pify": true,
-          "browserify>browser-resolve": true,
-          "eth-rpc-errors": true,
-          "json-rpc-engine": true,
-          "json-rpc-engine>@metamask/safe-event-emitter": true,
-          "lavamoat>json-stable-stringify": true,
-          "vinyl>clone": true
-        }
-      },
-      "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util": {
-        "packages": {
-          "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util": true,
-          "ethereumjs-abi": true
-        }
-      },
-      "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util": {
-        "packages": {
-          "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethjs-util": true,
-          "bn.js": true,
-          "browserify>assert": true,
-          "browserify>buffer": true,
-          "ethereumjs-util>create-hash": true,
-          "ethereumjs-util>ethereum-cryptography": true,
-          "ethereumjs-util>rlp": true,
-          "ethereumjs-wallet>safe-buffer": true,
-          "ganache>secp256k1>elliptic": true
-        }
-      },
-      "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethjs-util": {
-        "packages": {
-          "browserify>buffer": true,
-          "ethjs>ethjs-util>is-hex-prefixed": true,
-          "ethjs>ethjs-util>strip-hex-prefix": true
-        }
-      },
-      "@metamask/eth-keyring-controller": {
-        "packages": {
-          "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring": true,
-          "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring": true,
-          "@metamask/eth-keyring-controller>obs-store": true,
-          "@metamask/rpc-methods>@metamask/browser-passworder": true,
-          "browserify>events": true,
-          "eth-json-rpc-middleware>@metamask/eth-sig-util": true
-        }
-      },
-      "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring": {
-        "globals": {
-          "TextEncoder": true
-        },
-        "packages": {
-          "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography": true,
-          "@metamask/scure-bip39": true,
-          "browserify>buffer": true,
-          "eth-json-rpc-middleware>@metamask/eth-sig-util": true,
-          "eth-lattice-keyring>@ethereumjs/util": true
-        }
-      },
-      "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography": {
-        "globals": {
-          "TextDecoder": true,
-          "crypto": true
-        },
-        "packages": {
-          "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography>@noble/hashes": true,
-          "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@scure/bip32": true
-        }
-      },
-      "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography>@noble/hashes": {
-        "globals": {
-          "TextEncoder": true,
-          "crypto": true
-        }
-      },
-      "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring": {
-        "packages": {
-          "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography": true,
-          "browserify>buffer": true,
-          "browserify>events": true,
-          "eth-json-rpc-middleware>@metamask/eth-sig-util": true,
-          "eth-lattice-keyring>@ethereumjs/util": true,
-          "ethereumjs-wallet>randombytes": true
-        }
-      },
-      "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography": {
-        "globals": {
-          "TextDecoder": true,
-          "crypto": true
-        },
-        "packages": {
-          "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography>@noble/hashes": true
-        }
-      },
-      "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography>@noble/hashes": {
-        "globals": {
-          "TextEncoder": true,
-          "crypto": true
-        }
-      },
-      "@metamask/eth-keyring-controller>obs-store": {
-        "packages": {
-          "safe-event-emitter": true,
-          "watchify>xtend": true
-        }
-      },
-      "@metamask/eth-ledger-bridge-keyring": {
-        "globals": {
-          "addEventListener": true,
-          "console.log": true,
-          "document.createElement": true,
-          "document.head.appendChild": true,
-          "fetch": true,
-          "removeEventListener": true
-        },
-        "packages": {
-          "@ethereumjs/tx": true,
-          "@metamask/eth-ledger-bridge-keyring>eth-sig-util": true,
-          "@metamask/eth-ledger-bridge-keyring>hdkey": true,
-          "browserify>buffer": true,
-          "browserify>events": true,
-          "ethereumjs-util": true
-        }
-      },
-      "@metamask/eth-ledger-bridge-keyring>eth-sig-util": {
-        "packages": {
-          "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util": true,
-          "browserify>buffer": true,
-          "eth-sig-util>tweetnacl": true,
-          "eth-sig-util>tweetnacl-util": true,
-          "ethereumjs-abi": true
-        }
-      },
-      "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util": {
-        "packages": {
-          "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util>ethjs-util": true,
-          "bn.js": true,
-          "browserify>assert": true,
-          "browserify>buffer": true,
-          "ethereumjs-util>create-hash": true,
-          "ethereumjs-util>ethereum-cryptography": true,
-          "ethereumjs-util>rlp": true,
-          "ethereumjs-wallet>safe-buffer": true,
-          "ganache>secp256k1>elliptic": true
-        }
-      },
-      "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util>ethjs-util": {
-        "packages": {
-          "browserify>buffer": true,
-          "ethjs>ethjs-util>is-hex-prefixed": true,
-          "ethjs>ethjs-util>strip-hex-prefix": true
-        }
-      },
-      "@metamask/eth-ledger-bridge-keyring>hdkey": {
-        "packages": {
-          "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": true,
-          "browserify>assert": true,
-          "browserify>crypto-browserify": true,
-          "eth-trezor-keyring>hdkey>coinstring": true,
-          "ethereumjs-wallet>safe-buffer": true
-        }
-      },
-      "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": {
-        "packages": {
-          "bn.js": true,
-          "browserify>insert-module-globals>is-buffer": true,
-          "eth-trezor-keyring>hdkey>secp256k1>bip66": true,
-          "ethereumjs-util>create-hash": true,
-          "ethereumjs-wallet>safe-buffer": true,
-          "ganache>secp256k1>elliptic": true
-        }
-      },
-      "@metamask/eth-token-tracker": {
-        "globals": {
-          "console.warn": true
-        },
-        "packages": {
-          "@babel/runtime": true,
-          "@metamask/eth-token-tracker>deep-equal": true,
-          "@metamask/eth-token-tracker>eth-block-tracker": true,
-          "@metamask/eth-token-tracker>ethjs": true,
-          "@metamask/eth-token-tracker>human-standard-token-abi": true,
-          "ethjs-contract": true,
-          "ethjs-query": true,
-          "safe-event-emitter": true
-        }
-      },
-      "@metamask/eth-token-tracker>deep-equal": {
-        "packages": {
-          "@metamask/eth-token-tracker>deep-equal>is-arguments": true,
-          "@metamask/eth-token-tracker>deep-equal>is-date-object": true,
-          "enzyme>is-regex": true,
-          "enzyme>object-is": true,
-          "mocha>object.assign>object-keys": true,
-          "string.prototype.matchall>regexp.prototype.flags": true
-        }
-      },
-      "@metamask/eth-token-tracker>deep-equal>is-arguments": {
-        "packages": {
-          "koa>is-generator-function>has-tostringtag": true,
-          "string.prototype.matchall>call-bind": true
-        }
-      },
-      "@metamask/eth-token-tracker>deep-equal>is-date-object": {
-        "packages": {
-          "koa>is-generator-function>has-tostringtag": true
-        }
-      },
-      "@metamask/eth-token-tracker>eth-block-tracker": {
-        "globals": {
-          "clearTimeout": true,
-          "console.error": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "@metamask/eth-token-tracker>eth-block-tracker>pify": true,
-          "eth-query": true,
-          "safe-event-emitter": true
-        }
-      },
-      "@metamask/eth-token-tracker>ethjs": {
-        "globals": {
-          "clearInterval": true,
-          "setInterval": true
-        },
-        "packages": {
-          "@metamask/eth-token-tracker>ethjs>bn.js": true,
-          "@metamask/eth-token-tracker>ethjs>ethjs-abi": true,
-          "@metamask/eth-token-tracker>ethjs>ethjs-contract": true,
-          "@metamask/eth-token-tracker>ethjs>ethjs-query": true,
-          "browserify>buffer": true,
-          "ethjs>ethjs-filter": true,
-          "ethjs>ethjs-provider-http": true,
-          "ethjs>ethjs-unit": true,
-          "ethjs>ethjs-util": true,
-          "ethjs>js-sha3": true,
-          "ethjs>number-to-bn": true
-        }
-      },
-      "@metamask/eth-token-tracker>ethjs>ethjs-abi": {
-        "packages": {
-          "@metamask/eth-token-tracker>ethjs>bn.js": true,
-          "browserify>buffer": true,
-          "ethjs>js-sha3": true,
-          "ethjs>number-to-bn": true
-        }
-      },
-      "@metamask/eth-token-tracker>ethjs>ethjs-contract": {
-        "packages": {
-          "@metamask/eth-token-tracker>ethjs>ethjs-contract>ethjs-abi": true,
-          "ethjs-query>babel-runtime": true,
-          "ethjs>ethjs-filter": true,
-          "ethjs>ethjs-util": true,
-          "ethjs>js-sha3": true,
-          "promise-to-callback": true
-        }
-      },
-      "@metamask/eth-token-tracker>ethjs>ethjs-contract>ethjs-abi": {
-        "packages": {
-          "@metamask/eth-token-tracker>ethjs>bn.js": true,
-          "browserify>buffer": true,
-          "ethjs>js-sha3": true,
-          "ethjs>number-to-bn": true
-        }
-      },
-      "@metamask/eth-token-tracker>ethjs>ethjs-query": {
-        "globals": {
-          "console": true
-        },
-        "packages": {
-          "ethjs-query>babel-runtime": true,
-          "ethjs-query>ethjs-format": true,
-          "ethjs-query>ethjs-rpc": true,
-          "promise-to-callback": true
-        }
-      },
-      "@metamask/etherscan-link": {
-        "globals": {
-          "URL": true
-        }
-      },
-      "@metamask/gas-fee-controller": {
-        "globals": {
-          "clearInterval": true,
-          "console.error": true,
-          "setInterval": true
-        },
-        "packages": {
-          "@metamask/controller-utils": true,
-          "@metamask/gas-fee-controller>@metamask/base-controller": true,
-          "eth-query": true,
-          "ethereumjs-util": true,
-          "ethjs>ethjs-unit": true,
-          "uuid": true
-        }
-      },
-      "@metamask/gas-fee-controller>@metamask/base-controller": {
-        "packages": {
-          "immer": true
-        }
-      },
-      "@metamask/jazzicon": {
-        "globals": {
-          "document.createElement": true,
-          "document.createElementNS": true
-        },
-        "packages": {
-          "@metamask/jazzicon>color": true,
-          "@metamask/jazzicon>mersenne-twister": true
-        }
-      },
-      "@metamask/jazzicon>color": {
-        "packages": {
-          "@metamask/jazzicon>color>clone": true,
-          "@metamask/jazzicon>color>color-convert": true,
-          "@metamask/jazzicon>color>color-string": true
-        }
-      },
-      "@metamask/jazzicon>color>clone": {
-        "packages": {
-          "browserify>buffer": true
-        }
-      },
-      "@metamask/jazzicon>color>color-convert": {
-        "packages": {
-          "@metamask/jazzicon>color>color-convert>color-name": true
-        }
-      },
-      "@metamask/jazzicon>color>color-string": {
-        "packages": {
-          "jest-canvas-mock>moo-color>color-name": true
-        }
-      },
-      "@metamask/logo": {
-        "globals": {
-          "addEventListener": true,
-          "document.body.appendChild": true,
-          "document.createElementNS": true,
-          "innerHeight": true,
-          "innerWidth": true,
-          "requestAnimationFrame": true
-        },
-        "packages": {
-          "@metamask/logo>gl-mat4": true,
-          "@metamask/logo>gl-vec3": true
-        }
-      },
-      "@metamask/notification-controller": {
-        "packages": {
-          "@metamask/controller-utils": true,
-          "@metamask/notification-controller>@metamask/base-controller": true,
-          "@metamask/notification-controller>nanoid": true
-        }
-      },
-      "@metamask/notification-controller>@metamask/base-controller": {
-        "packages": {
-          "immer": true
-        }
-      },
-      "@metamask/notification-controller>nanoid": {
-        "globals": {
-          "crypto.getRandomValues": true
-        }
-      },
-      "@metamask/obs-store": {
-        "globals": {
-          "localStorage": true
-        },
-        "packages": {
-          "@metamask/obs-store>through2": true,
-          "browserify>stream-browserify": true,
-          "json-rpc-engine>@metamask/safe-event-emitter": true
-        }
-      },
-      "@metamask/obs-store>through2": {
-        "packages": {
-          "browserify>process": true,
-          "browserify>util": true,
-          "readable-stream": true,
-          "watchify>xtend": true
-        }
-      },
-      "@metamask/permission-controller": {
-        "packages": {
-          "@metamask/base-controller": true,
-          "@metamask/controller-utils": true,
-          "@metamask/permission-controller>nanoid": true,
-          "deep-freeze-strict": true,
-          "eth-rpc-errors": true,
-          "immer": true,
-          "json-rpc-engine": true
-        }
-      },
-      "@metamask/permission-controller>nanoid": {
-        "globals": {
-          "crypto.getRandomValues": true
-        }
-      },
-      "@metamask/phishing-controller": {
-        "globals": {
-          "fetch": true
-        },
-        "packages": {
-          "@metamask/base-controller": true,
-          "@metamask/controller-utils": true,
-          "@metamask/controller-utils>isomorphic-fetch": true,
-          "@metamask/phishing-warning>eth-phishing-detect": true,
-          "punycode": true
-        }
-      },
-      "@metamask/phishing-warning>eth-phishing-detect": {
-        "packages": {
-          "eslint>optionator>fast-levenshtein": true
-        }
-      },
-      "@metamask/post-message-stream": {
-        "globals": {
-          "WorkerGlobalScope": true,
-          "addEventListener": true,
-          "browser": true,
-          "chrome": true,
-          "location.origin": true,
-          "onmessage": "write",
-          "postMessage": true,
-          "removeEventListener": true
-        },
-        "packages": {
-          "@metamask/post-message-stream>readable-stream": true,
-          "@metamask/utils": true
-        }
-      },
-      "@metamask/post-message-stream>readable-stream": {
-        "packages": {
-          "@metamask/post-message-stream>readable-stream>process-nextick-args": true,
-          "@metamask/post-message-stream>readable-stream>safe-buffer": true,
-          "@metamask/post-message-stream>readable-stream>string_decoder": true,
-          "@storybook/api>util-deprecate": true,
-          "browserify>browser-resolve": true,
-          "browserify>events": true,
-          "browserify>process": true,
-          "browserify>timers-browserify": true,
-          "pumpify>inherits": true,
-          "readable-stream>core-util-is": true,
-          "readable-stream>isarray": true
-        }
-      },
-      "@metamask/post-message-stream>readable-stream>process-nextick-args": {
-        "packages": {
-          "browserify>process": true
-        }
-      },
-      "@metamask/post-message-stream>readable-stream>safe-buffer": {
-        "packages": {
-          "browserify>buffer": true
-        }
-      },
-      "@metamask/post-message-stream>readable-stream>string_decoder": {
-        "packages": {
-          "@metamask/post-message-stream>readable-stream>safe-buffer": true
-        }
-      },
-      "@metamask/providers>@metamask/object-multiplex": {
-        "globals": {
-          "console.warn": true
-        },
-        "packages": {
-          "end-of-stream": true,
-          "pump>once": true,
-          "readable-stream": true
-        }
-      },
-      "@metamask/rate-limit-controller": {
-        "globals": {
-          "setTimeout": true
-        },
-        "packages": {
-          "@metamask/rate-limit-controller>@metamask/base-controller": true,
-          "eth-rpc-errors": true
-        }
-      },
-      "@metamask/rate-limit-controller>@metamask/base-controller": {
-        "packages": {
-          "immer": true
-        }
-      },
-      "@metamask/rpc-methods": {
-        "globals": {
-          "console.warn": true
-        },
-        "packages": {
-          "@metamask/permission-controller": true,
-          "@metamask/rpc-methods>@metamask/browser-passworder": true,
-          "@metamask/rpc-methods>@metamask/key-tree": true,
-          "@metamask/rpc-methods>nanoid": true,
-          "@metamask/snaps-ui": true,
-          "@metamask/snaps-utils": true,
-          "@metamask/snaps-utils>@noble/hashes": true,
-          "@metamask/utils": true,
-          "@metamask/utils>superstruct": true,
-          "eth-rpc-errors": true
-        }
-      },
-      "@metamask/rpc-methods>@metamask/browser-passworder": {
-        "globals": {
-          "btoa": true,
-          "crypto.getRandomValues": true,
-          "crypto.subtle.decrypt": true,
-          "crypto.subtle.deriveKey": true,
-          "crypto.subtle.encrypt": true,
-          "crypto.subtle.exportKey": true,
-          "crypto.subtle.importKey": true
-        },
-        "packages": {
-          "browserify>buffer": true
-        }
-      },
-      "@metamask/rpc-methods>@metamask/key-tree": {
-        "packages": {
-          "@metamask/rpc-methods>@metamask/key-tree>@noble/ed25519": true,
-          "@metamask/rpc-methods>@metamask/key-tree>@noble/secp256k1": true,
-          "@metamask/scure-bip39": true,
-          "@metamask/snaps-utils>@noble/hashes": true,
-          "@metamask/snaps-utils>@scure/base": true,
-          "@metamask/utils": true
-        }
-      },
-      "@metamask/rpc-methods>@metamask/key-tree>@noble/ed25519": {
-        "globals": {
-          "crypto": true
-        },
-        "packages": {
-          "browserify>browser-resolve": true
-        }
-      },
-      "@metamask/rpc-methods>@metamask/key-tree>@noble/secp256k1": {
-        "globals": {
-          "crypto": true
-        },
-        "packages": {
-          "browserify>browser-resolve": true
-        }
-      },
-      "@metamask/rpc-methods>nanoid": {
-        "globals": {
-          "crypto.getRandomValues": true
-        }
-      },
-      "@metamask/scure-bip39": {
-        "globals": {
-          "TextEncoder": true
-        },
-        "packages": {
-          "@metamask/snaps-utils>@noble/hashes": true,
-          "@metamask/snaps-utils>@scure/base": true
-        }
-      },
-      "@metamask/smart-transactions-controller": {
-        "globals": {
-          "URLSearchParams": true,
-          "clearInterval": true,
-          "console.error": true,
-          "console.log": true,
-          "fetch": true,
-          "setInterval": true
-        },
-        "packages": {
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/bignumber": true,
-          "@ethersproject/providers": true,
-          "@metamask/base-controller": true,
-          "@metamask/controller-utils": true,
-          "@metamask/controller-utils>isomorphic-fetch": true,
-          "@metamask/smart-transactions-controller>bignumber.js": true,
-          "fast-json-patch": true,
-          "lodash": true
-        }
-      },
-      "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
-        "globals": {
-          "crypto.getRandomValues": true
-        }
-      },
-      "@metamask/smart-transactions-controller>bignumber.js": {
-        "globals": {
-          "crypto": true,
-          "define": true
-        }
-      },
-      "@metamask/snaps-controllers": {
-        "globals": {
-          "URL": true,
-          "chrome.offscreen.createDocument": true,
-          "chrome.offscreen.hasDocument": true,
-          "clearTimeout": true,
-          "console.error": true,
-          "console.info": true,
-          "console.log": true,
-          "console.warn": true,
-          "document.getElementById": true,
-          "fetch.bind": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "@metamask/base-controller": true,
-          "@metamask/permission-controller": true,
-          "@metamask/post-message-stream": true,
-          "@metamask/providers>@metamask/object-multiplex": true,
-          "@metamask/rpc-methods": true,
-          "@metamask/snaps-controllers>@xstate/fsm": true,
-          "@metamask/snaps-controllers>concat-stream": true,
-          "@metamask/snaps-controllers>gunzip-maybe": true,
-          "@metamask/snaps-controllers>json-rpc-middleware-stream": true,
-          "@metamask/snaps-controllers>nanoid": true,
-          "@metamask/snaps-controllers>readable-web-to-node-stream": true,
-          "@metamask/snaps-controllers>tar-stream": true,
-          "@metamask/snaps-utils": true,
-          "@metamask/subject-metadata-controller": true,
-          "@metamask/utils": true,
-          "eth-rpc-errors": true,
-          "json-rpc-engine": true,
-          "pump": true
-        }
-      },
-      "@metamask/snaps-controllers>concat-stream": {
-        "packages": {
-          "@metamask/snaps-controllers>concat-stream>readable-stream": true,
-          "browserify>buffer": true,
-          "pumpify>inherits": true
-        }
-      },
-      "@metamask/snaps-controllers>concat-stream>readable-stream": {
-        "packages": {
-          "@storybook/api>util-deprecate": true,
-          "browserify>browser-resolve": true,
-          "browserify>buffer": true,
-          "browserify>events": true,
-          "browserify>process": true,
-          "browserify>string_decoder": true,
-          "pumpify>inherits": true
-        }
-      },
-      "@metamask/snaps-controllers>gunzip-maybe": {
-        "packages": {
-          "@metamask/snaps-controllers>gunzip-maybe>browserify-zlib": true,
-          "@metamask/snaps-controllers>gunzip-maybe>is-deflate": true,
-          "@metamask/snaps-controllers>gunzip-maybe>is-gzip": true,
-          "@metamask/snaps-controllers>gunzip-maybe>peek-stream": true,
-          "@metamask/snaps-controllers>gunzip-maybe>pumpify": true,
-          "@metamask/snaps-controllers>gunzip-maybe>through2": true
-        }
-      },
-      "@metamask/snaps-controllers>gunzip-maybe>browserify-zlib": {
-        "packages": {
-          "@metamask/snaps-controllers>gunzip-maybe>browserify-zlib>pako": true,
-          "browserify>assert": true,
-          "browserify>buffer": true,
-          "browserify>process": true,
-          "browserify>util": true,
-          "readable-stream": true
-        }
-      },
-      "@metamask/snaps-controllers>gunzip-maybe>peek-stream": {
-        "packages": {
-          "@metamask/snaps-controllers>gunzip-maybe>peek-stream>duplexify": true,
-          "@metamask/snaps-controllers>gunzip-maybe>peek-stream>through2": true,
-          "browserify>buffer": true,
-          "terser>source-map-support>buffer-from": true
-        }
-      },
-      "@metamask/snaps-controllers>gunzip-maybe>peek-stream>duplexify": {
-        "packages": {
-          "browserify>buffer": true,
-          "browserify>process": true,
-          "duplexify>stream-shift": true,
-          "end-of-stream": true,
-          "pumpify>inherits": true,
-          "readable-stream": true
-        }
-      },
-      "@metamask/snaps-controllers>gunzip-maybe>peek-stream>through2": {
-        "packages": {
-          "browserify>process": true,
-          "browserify>util": true,
-          "readable-stream": true,
-          "watchify>xtend": true
-        }
-      },
-      "@metamask/snaps-controllers>gunzip-maybe>pumpify": {
-        "packages": {
-          "@metamask/snaps-controllers>gunzip-maybe>pumpify>duplexify": true,
-          "@metamask/snaps-controllers>gunzip-maybe>pumpify>pump": true,
-          "pumpify>inherits": true
-        }
-      },
-      "@metamask/snaps-controllers>gunzip-maybe>pumpify>duplexify": {
-        "packages": {
-          "browserify>buffer": true,
-          "browserify>process": true,
-          "duplexify>stream-shift": true,
-          "end-of-stream": true,
-          "pumpify>inherits": true,
-          "readable-stream": true
-        }
-      },
-      "@metamask/snaps-controllers>gunzip-maybe>pumpify>pump": {
-        "packages": {
-          "browserify>browser-resolve": true,
-          "end-of-stream": true,
-          "pump>once": true
-        }
-      },
-      "@metamask/snaps-controllers>gunzip-maybe>through2": {
-        "packages": {
-          "browserify>process": true,
-          "browserify>util": true,
-          "readable-stream": true,
-          "watchify>xtend": true
-        }
-      },
-      "@metamask/snaps-controllers>json-rpc-middleware-stream": {
-        "globals": {
-          "console.warn": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "json-rpc-engine>@metamask/safe-event-emitter": true,
-          "readable-stream": true
-        }
-      },
-      "@metamask/snaps-controllers>nanoid": {
-        "globals": {
-          "crypto.getRandomValues": true
-        }
-      },
-      "@metamask/snaps-controllers>readable-web-to-node-stream": {
-        "packages": {
-          "@metamask/snaps-controllers>readable-web-to-node-stream>readable-stream": true
-        }
-      },
-      "@metamask/snaps-controllers>readable-web-to-node-stream>readable-stream": {
-        "packages": {
-          "@storybook/api>util-deprecate": true,
-          "browserify>browser-resolve": true,
-          "browserify>buffer": true,
-          "browserify>events": true,
-          "browserify>process": true,
-          "browserify>string_decoder": true,
-          "pumpify>inherits": true
-        }
-      },
-      "@metamask/snaps-controllers>tar-stream": {
-        "packages": {
-          "@metamask/snaps-controllers>tar-stream>fs-constants": true,
-          "@metamask/snaps-controllers>tar-stream>readable-stream": true,
-          "browserify>buffer": true,
-          "browserify>process": true,
-          "browserify>string_decoder": true,
-          "browserify>util": true,
-          "end-of-stream": true,
-          "madge>ora>bl": true,
-          "pumpify>inherits": true
-        }
-      },
-      "@metamask/snaps-controllers>tar-stream>fs-constants": {
-        "packages": {
-          "browserify>constants-browserify": true
-        }
-      },
-      "@metamask/snaps-controllers>tar-stream>readable-stream": {
-        "packages": {
-          "@storybook/api>util-deprecate": true,
-          "browserify>browser-resolve": true,
-          "browserify>buffer": true,
-          "browserify>events": true,
-          "browserify>process": true,
-          "browserify>string_decoder": true,
-          "pumpify>inherits": true
-        }
-      },
-      "@metamask/snaps-ui": {
-        "packages": {
-          "@metamask/utils": true,
-          "@metamask/utils>superstruct": true
-        }
-      },
-      "@metamask/snaps-utils": {
-        "globals": {
-          "TextDecoder": true,
-          "URL": true,
-          "document.body.appendChild": true,
-          "document.createElement": true
-        },
-        "packages": {
-          "@metamask/snaps-utils>@noble/hashes": true,
-          "@metamask/snaps-utils>@scure/base": true,
-          "@metamask/snaps-utils>cron-parser": true,
-          "@metamask/snaps-utils>rfdc": true,
-          "@metamask/snaps-utils>validate-npm-package-name": true,
-          "@metamask/utils": true,
-          "@metamask/utils>superstruct": true,
-          "semver": true
-        }
-      },
-      "@metamask/snaps-utils>@noble/hashes": {
-        "globals": {
-          "TextEncoder": true,
-          "crypto": true
-        }
-      },
-      "@metamask/snaps-utils>@scure/base": {
-        "globals": {
-          "TextDecoder": true,
-          "TextEncoder": true
-        }
-      },
-      "@metamask/snaps-utils>cron-parser": {
-        "packages": {
-          "browserify>browser-resolve": true,
-          "luxon": true
-        }
-      },
-      "@metamask/snaps-utils>rfdc": {
-        "packages": {
-          "browserify>buffer": true
-        }
-      },
-      "@metamask/snaps-utils>validate-npm-package-name": {
-        "packages": {
-          "@metamask/snaps-utils>validate-npm-package-name>builtins": true
-        }
-      },
-      "@metamask/snaps-utils>validate-npm-package-name>builtins": {
-        "packages": {
-          "browserify>process": true,
-          "semver": true
-        }
-      },
-      "@metamask/subject-metadata-controller": {
-        "packages": {
-          "@metamask/base-controller": true
-        }
-      },
-      "@metamask/utils": {
-        "globals": {
-          "TextDecoder": true,
-          "TextEncoder": true
-        },
-        "packages": {
-          "@metamask/utils>superstruct": true,
-          "browserify>buffer": true,
-          "nock>debug": true,
-          "semver": true
-        }
-      },
-      "@ngraveio/bc-ur": {
-        "packages": {
-          "@ngraveio/bc-ur>@apocentre/alias-sampling": true,
-          "@ngraveio/bc-ur>bignumber.js": true,
-          "@ngraveio/bc-ur>crc": true,
-          "@ngraveio/bc-ur>jsbi": true,
-          "addons-linter>sha.js": true,
-          "browserify>assert": true,
-          "browserify>buffer": true,
-          "pubnub>cbor-sync": true
-        }
-      },
-      "@ngraveio/bc-ur>bignumber.js": {
-        "globals": {
-          "crypto": true,
-          "define": true
-        }
-      },
-      "@ngraveio/bc-ur>crc": {
-        "packages": {
-          "browserify>buffer": true
-        }
-      },
-      "@ngraveio/bc-ur>jsbi": {
-        "globals": {
-          "define": true
-        }
-      },
-      "@popperjs/core": {
-        "globals": {
-          "Element": true,
-          "HTMLElement": true,
-          "ShadowRoot": true,
-          "console.error": true,
-          "console.warn": true,
-          "document": true,
-          "navigator.userAgent": true
-        }
-      },
-      "@reduxjs/toolkit": {
-        "globals": {
-          "AbortController": true,
-          "__REDUX_DEVTOOLS_EXTENSION_COMPOSE__": true,
-          "__REDUX_DEVTOOLS_EXTENSION__": true,
-          "console.error": true,
-          "console.info": true,
-          "console.warn": true
-        },
-        "packages": {
-          "@reduxjs/toolkit>reselect": true,
-          "immer": true,
-          "redux": true,
-          "redux-thunk": true
-        }
-      },
-      "@segment/loosely-validate-event": {
-        "packages": {
-          "@segment/loosely-validate-event>component-type": true,
-          "@segment/loosely-validate-event>join-component": true,
-          "browserify>assert": true,
-          "browserify>buffer": true
-        }
-      },
-      "@sentry/browser": {
-        "globals": {
-          "XMLHttpRequest": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "@sentry/browser>@sentry/core": true,
-          "@sentry/browser>tslib": true,
-          "@sentry/types": true,
-          "@sentry/utils": true
-        }
-      },
-      "@sentry/browser>@sentry/core": {
-        "globals": {
-          "clearInterval": true,
-          "setInterval": true
-        },
-        "packages": {
-          "@sentry/browser>@sentry/core>@sentry/hub": true,
-          "@sentry/browser>@sentry/core>@sentry/minimal": true,
-          "@sentry/browser>@sentry/core>tslib": true,
-          "@sentry/types": true,
-          "@sentry/utils": true
-        }
-      },
-      "@sentry/browser>@sentry/core>@sentry/hub": {
-        "globals": {
-          "clearInterval": true,
-          "setInterval": true
-        },
-        "packages": {
-          "@sentry/browser>@sentry/core>@sentry/hub>tslib": true,
-          "@sentry/types": true,
-          "@sentry/utils": true
-        }
-      },
-      "@sentry/browser>@sentry/core>@sentry/hub>tslib": {
-        "globals": {
-          "define": true
-        }
-      },
-      "@sentry/browser>@sentry/core>@sentry/minimal": {
-        "packages": {
-          "@sentry/browser>@sentry/core>@sentry/hub": true,
-          "@sentry/browser>@sentry/core>@sentry/minimal>tslib": true
-        }
-      },
-      "@sentry/browser>@sentry/core>@sentry/minimal>tslib": {
-        "globals": {
-          "define": true
-        }
-      },
-      "@sentry/browser>@sentry/core>tslib": {
-        "globals": {
-          "define": true
-        }
-      },
-      "@sentry/browser>tslib": {
-        "globals": {
-          "define": true
-        }
-      },
-      "@sentry/integrations": {
-        "globals": {
-          "clearTimeout": true,
-          "console.error": true,
-          "console.log": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "@sentry/integrations>tslib": true,
-          "@sentry/types": true,
-          "@sentry/utils": true,
-          "localforage": true
-        }
-      },
-      "@sentry/integrations>tslib": {
-        "globals": {
-          "define": true
-        }
-      },
-      "@sentry/utils": {
-        "globals": {
-          "CustomEvent": true,
-          "DOMError": true,
-          "DOMException": true,
-          "Element": true,
-          "ErrorEvent": true,
-          "Event": true,
-          "Headers": true,
-          "Request": true,
-          "Response": true,
-          "XMLHttpRequest.prototype": true,
-          "clearTimeout": true,
-          "console.error": true,
-          "document": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "@sentry/utils>tslib": true,
-          "browserify>process": true
-        }
-      },
-      "@sentry/utils>tslib": {
-        "globals": {
-          "define": true
-        }
-      },
-      "@spruceid/siwe-parser": {
-        "globals": {
-          "console.error": true,
-          "console.log": true
-        },
-        "packages": {
-          "@spruceid/siwe-parser>apg-js": true
-        }
-      },
-      "@spruceid/siwe-parser>apg-js": {
-        "globals": {
-          "mode": true
-        },
-        "packages": {
-          "browserify>buffer": true,
-          "browserify>insert-module-globals>is-buffer": true
-        }
-      },
-      "@storybook/api>regenerator-runtime": {
-        "globals": {
-          "regeneratorRuntime": "write"
-        }
-      },
-      "@storybook/api>util-deprecate": {
-        "globals": {
-          "console.trace": true,
-          "console.warn": true,
-          "localStorage": true
-        }
-      },
-      "@truffle/codec": {
-        "packages": {
-          "@truffle/codec>@truffle/abi-utils": true,
-          "@truffle/codec>@truffle/compile-common": true,
-          "@truffle/codec>big.js": true,
-          "@truffle/codec>bn.js": true,
-          "@truffle/codec>cbor": true,
-          "@truffle/codec>semver": true,
-          "@truffle/codec>utf8": true,
-          "@truffle/codec>web3-utils": true,
-          "browserify>buffer": true,
-          "browserify>os-browserify": true,
-          "browserify>util": true,
-          "lodash": true,
-          "nock>debug": true
-        }
-      },
-      "@truffle/codec>@truffle/abi-utils": {
-        "packages": {
-          "@truffle/codec>@truffle/abi-utils>change-case": true,
-          "@truffle/codec>@truffle/abi-utils>fast-check": true,
-          "@truffle/codec>web3-utils": true
-        }
-      },
-      "@truffle/codec>@truffle/abi-utils>change-case": {
-        "packages": {
-          "@truffle/codec>@truffle/abi-utils>change-case>camel-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>constant-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>dot-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>header-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>is-lower-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>is-upper-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>lower-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>lower-case-first": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>no-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>param-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>pascal-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>path-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>sentence-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>snake-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>swap-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>title-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>upper-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>upper-case-first": true
-        }
-      },
-      "@truffle/codec>@truffle/abi-utils>change-case>camel-case": {
-        "packages": {
-          "@truffle/codec>@truffle/abi-utils>change-case>no-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>upper-case": true
-        }
-      },
-      "@truffle/codec>@truffle/abi-utils>change-case>constant-case": {
-        "packages": {
-          "@truffle/codec>@truffle/abi-utils>change-case>snake-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>upper-case": true
-        }
-      },
-      "@truffle/codec>@truffle/abi-utils>change-case>dot-case": {
-        "packages": {
-          "@truffle/codec>@truffle/abi-utils>change-case>no-case": true
-        }
-      },
-      "@truffle/codec>@truffle/abi-utils>change-case>header-case": {
-        "packages": {
-          "@truffle/codec>@truffle/abi-utils>change-case>no-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>upper-case": true
-        }
-      },
-      "@truffle/codec>@truffle/abi-utils>change-case>is-lower-case": {
-        "packages": {
-          "@truffle/codec>@truffle/abi-utils>change-case>lower-case": true
-        }
-      },
-      "@truffle/codec>@truffle/abi-utils>change-case>is-upper-case": {
-        "packages": {
-          "@truffle/codec>@truffle/abi-utils>change-case>upper-case": true
-        }
-      },
-      "@truffle/codec>@truffle/abi-utils>change-case>lower-case-first": {
-        "packages": {
-          "@truffle/codec>@truffle/abi-utils>change-case>lower-case": true
-        }
-      },
-      "@truffle/codec>@truffle/abi-utils>change-case>no-case": {
-        "packages": {
-          "@truffle/codec>@truffle/abi-utils>change-case>lower-case": true
-        }
-      },
-      "@truffle/codec>@truffle/abi-utils>change-case>param-case": {
-        "packages": {
-          "@truffle/codec>@truffle/abi-utils>change-case>no-case": true
-        }
-      },
-      "@truffle/codec>@truffle/abi-utils>change-case>pascal-case": {
-        "packages": {
-          "@truffle/codec>@truffle/abi-utils>change-case>pascal-case>camel-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>upper-case-first": true
-        }
-      },
-      "@truffle/codec>@truffle/abi-utils>change-case>pascal-case>camel-case": {
-        "packages": {
-          "@truffle/codec>@truffle/abi-utils>change-case>no-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>upper-case": true
-        }
-      },
-      "@truffle/codec>@truffle/abi-utils>change-case>path-case": {
-        "packages": {
-          "@truffle/codec>@truffle/abi-utils>change-case>no-case": true
-        }
-      },
-      "@truffle/codec>@truffle/abi-utils>change-case>sentence-case": {
-        "packages": {
-          "@truffle/codec>@truffle/abi-utils>change-case>no-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>upper-case-first": true
-        }
-      },
-      "@truffle/codec>@truffle/abi-utils>change-case>snake-case": {
-        "packages": {
-          "@truffle/codec>@truffle/abi-utils>change-case>no-case": true
-        }
-      },
-      "@truffle/codec>@truffle/abi-utils>change-case>swap-case": {
-        "packages": {
-          "@truffle/codec>@truffle/abi-utils>change-case>lower-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>upper-case": true
-        }
-      },
-      "@truffle/codec>@truffle/abi-utils>change-case>title-case": {
-        "packages": {
-          "@truffle/codec>@truffle/abi-utils>change-case>no-case": true,
-          "@truffle/codec>@truffle/abi-utils>change-case>upper-case": true
-        }
-      },
-      "@truffle/codec>@truffle/abi-utils>change-case>upper-case-first": {
-        "packages": {
-          "@truffle/codec>@truffle/abi-utils>change-case>upper-case": true
-        }
-      },
-      "@truffle/codec>@truffle/abi-utils>fast-check": {
-        "globals": {
-          "clearTimeout": true,
-          "console.log": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "@truffle/codec>@truffle/abi-utils>fast-check>pure-rand": true,
-          "browserify>buffer": true
-        }
-      },
-      "@truffle/codec>@truffle/compile-common": {
-        "packages": {
-          "@truffle/codec>@truffle/compile-common>@truffle/error": true,
-          "@truffle/codec>@truffle/compile-common>colors": true,
-          "browserify>path-browserify": true
-        }
-      },
-      "@truffle/codec>@truffle/compile-common>colors": {
-        "globals": {
-          "console.log": true
-        },
-        "packages": {
-          "browserify>os-browserify": true,
-          "browserify>process": true,
-          "browserify>util": true
-        }
-      },
-      "@truffle/codec>big.js": {
-        "globals": {
-          "define": true
-        }
-      },
-      "@truffle/codec>bn.js": {
-        "globals": {
-          "Buffer": true
-        },
-        "packages": {
-          "browserify>browser-resolve": true
-        }
-      },
-      "@truffle/codec>cbor": {
-        "globals": {
-          "TextDecoder": true
-        },
-        "packages": {
-          "@truffle/codec>cbor>bignumber.js": true,
-          "@truffle/codec>cbor>nofilter": true,
-          "browserify>buffer": true,
-          "browserify>insert-module-globals>is-buffer": true,
-          "browserify>stream-browserify": true,
-          "browserify>url": true,
-          "browserify>util": true
-        }
-      },
-      "@truffle/codec>cbor>bignumber.js": {
-        "globals": {
-          "crypto": true,
-          "define": true
-        }
-      },
-      "@truffle/codec>cbor>nofilter": {
-        "packages": {
-          "browserify>buffer": true,
-          "browserify>stream-browserify": true,
-          "browserify>util": true
-        }
-      },
-      "@truffle/codec>semver": {
-        "globals": {
-          "console.error": true
-        },
-        "packages": {
-          "@truffle/codec>semver>lru-cache": true,
-          "browserify>process": true
-        }
-      },
-      "@truffle/codec>semver>lru-cache": {
-        "packages": {
-          "semver>lru-cache>yallist": true
-        }
-      },
-      "@truffle/codec>web3-utils": {
-        "globals": {
-          "setTimeout": true
-        },
-        "packages": {
-          "@truffle/codec>utf8": true,
-          "@truffle/codec>web3-utils>bn.js": true,
-          "@truffle/codec>web3-utils>ethereum-bloom-filters": true,
-          "browserify>buffer": true,
-          "ethereumjs-util": true,
-          "ethereumjs-wallet>randombytes": true,
-          "ethjs>ethjs-unit": true,
-          "ethjs>number-to-bn": true
-        }
-      },
-      "@truffle/codec>web3-utils>bn.js": {
-        "globals": {
-          "Buffer": true
-        },
-        "packages": {
-          "browserify>browser-resolve": true
-        }
-      },
-      "@truffle/codec>web3-utils>ethereum-bloom-filters": {
-        "packages": {
-          "@truffle/codec>web3-utils>ethereum-bloom-filters>js-sha3": true
-        }
-      },
-      "@truffle/codec>web3-utils>ethereum-bloom-filters>js-sha3": {
-        "globals": {
-          "define": true
-        },
-        "packages": {
-          "browserify>process": true
-        }
-      },
-      "@truffle/decoder": {
-        "packages": {
-          "@truffle/codec": true,
-          "@truffle/codec>@truffle/abi-utils": true,
-          "@truffle/codec>@truffle/compile-common": true,
-          "@truffle/codec>web3-utils": true,
-          "@truffle/decoder>@truffle/encoder": true,
-          "@truffle/decoder>@truffle/source-map-utils": true,
-          "@truffle/decoder>bn.js": true,
-          "nock>debug": true
-        }
-      },
-      "@truffle/decoder>@truffle/encoder": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/address": true,
-          "@ethersproject/bignumber": true,
-          "@truffle/codec": true,
-          "@truffle/codec>@truffle/abi-utils": true,
-          "@truffle/codec>@truffle/compile-common": true,
-          "@truffle/codec>web3-utils": true,
-          "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs": true,
-          "@truffle/decoder>@truffle/encoder>big.js": true,
-          "@truffle/decoder>@truffle/encoder>bignumber.js": true,
-          "lodash": true,
-          "nock>debug": true
-        }
-      },
-      "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs": {
-        "globals": {
-          "console.log": true,
-          "console.warn": true,
-          "registries": true
-        },
-        "packages": {
-          "@babel/runtime": true,
-          "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>@ensdomains/address-encoder": true,
-          "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>@ensdomains/ens": true,
-          "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>@ensdomains/resolver": true,
-          "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash": true,
-          "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers": true,
-          "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>js-sha3": true,
-          "browserify>buffer": true,
-          "eth-ens-namehash": true,
-          "ethereumjs-wallet>bs58check>bs58": true
-        }
-      },
-      "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>@ensdomains/address-encoder": {
-        "globals": {
-          "console": true
-        },
-        "packages": {
-          "bn.js": true,
-          "browserify>buffer": true,
-          "browserify>crypto-browserify": true,
-          "ethereumjs-util>create-hash>ripemd160": true
-        }
-      },
-      "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash": {
-        "packages": {
-          "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>cids": true,
-          "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>multicodec": true,
-          "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>multihashes": true,
-          "browserify>buffer": true
-        }
-      },
-      "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>cids": {
-        "packages": {
-          "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>cids>class-is": true,
-          "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>cids>multibase": true,
-          "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>cids>multicodec": true,
-          "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>multihashes": true,
-          "browserify>buffer": true
-        }
-      },
-      "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>cids>multibase": {
-        "packages": {
-          "browserify>buffer": true,
-          "ethereumjs-wallet>bs58check>bs58>base-x": true
-        }
-      },
-      "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>cids>multicodec": {
-        "packages": {
-          "@ensdomains/content-hash>multihashes>varint": true,
-          "browserify>buffer": true
-        }
-      },
-      "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>multicodec": {
-        "packages": {
-          "@ensdomains/content-hash>multihashes>varint": true,
-          "browserify>buffer": true
-        }
-      },
-      "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>multihashes": {
-        "packages": {
-          "@ensdomains/content-hash>multihashes>varint": true,
-          "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>multihashes>multibase": true,
-          "browserify>buffer": true
-        }
-      },
-      "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>multihashes>multibase": {
-        "packages": {
-          "browserify>buffer": true,
-          "ethereumjs-wallet>bs58check>bs58>base-x": true
-        }
-      },
-      "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers": {
-        "packages": {
-          "@ethersproject/abi": true,
-          "@ethersproject/abi>@ethersproject/address": true,
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/abi>@ethersproject/constants": true,
-          "@ethersproject/abi>@ethersproject/hash": true,
-          "@ethersproject/abi>@ethersproject/keccak256": true,
-          "@ethersproject/abi>@ethersproject/logger": true,
-          "@ethersproject/abi>@ethersproject/properties": true,
-          "@ethersproject/abi>@ethersproject/strings": true,
-          "@ethersproject/bignumber": true,
-          "@ethersproject/contracts": true,
-          "@ethersproject/hdnode": true,
-          "@ethersproject/hdnode>@ethersproject/abstract-signer": true,
-          "@ethersproject/hdnode>@ethersproject/basex": true,
-          "@ethersproject/hdnode>@ethersproject/sha2": true,
-          "@ethersproject/hdnode>@ethersproject/signing-key": true,
-          "@ethersproject/hdnode>@ethersproject/transactions": true,
-          "@ethersproject/hdnode>@ethersproject/wordlists": true,
-          "@ethersproject/providers": true,
-          "@ethersproject/providers>@ethersproject/base64": true,
-          "@ethersproject/providers>@ethersproject/random": true,
-          "@ethersproject/providers>@ethersproject/rlp": true,
-          "@ethersproject/providers>@ethersproject/web": true,
-          "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers>@ethersproject/json-wallets": true,
-          "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers>@ethersproject/solidity": true,
-          "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers>@ethersproject/units": true,
-          "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers>@ethersproject/wallet": true
-        }
-      },
-      "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers>@ethersproject/json-wallets": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/address": true,
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/abi>@ethersproject/keccak256": true,
-          "@ethersproject/abi>@ethersproject/logger": true,
-          "@ethersproject/abi>@ethersproject/properties": true,
-          "@ethersproject/abi>@ethersproject/strings": true,
-          "@ethersproject/hdnode": true,
-          "@ethersproject/hdnode>@ethersproject/pbkdf2": true,
-          "@ethersproject/hdnode>@ethersproject/transactions": true,
-          "@ethersproject/providers>@ethersproject/random": true,
-          "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers>@ethersproject/json-wallets>aes-js": true,
-          "ethereumjs-util>ethereum-cryptography>scrypt-js": true
-        }
-      },
-      "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers>@ethersproject/json-wallets>aes-js": {
-        "globals": {
-          "define": true
-        }
-      },
-      "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers>@ethersproject/solidity": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/abi>@ethersproject/keccak256": true,
-          "@ethersproject/abi>@ethersproject/logger": true,
-          "@ethersproject/abi>@ethersproject/strings": true,
-          "@ethersproject/bignumber": true,
-          "@ethersproject/hdnode>@ethersproject/sha2": true
-        }
-      },
-      "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers>@ethersproject/units": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/logger": true,
-          "@ethersproject/bignumber": true
-        }
-      },
-      "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers>@ethersproject/wallet": {
-        "packages": {
-          "@ethersproject/abi>@ethersproject/address": true,
-          "@ethersproject/abi>@ethersproject/bytes": true,
-          "@ethersproject/abi>@ethersproject/hash": true,
-          "@ethersproject/abi>@ethersproject/keccak256": true,
-          "@ethersproject/abi>@ethersproject/logger": true,
-          "@ethersproject/abi>@ethersproject/properties": true,
-          "@ethersproject/hdnode": true,
-          "@ethersproject/hdnode>@ethersproject/abstract-signer": true,
-          "@ethersproject/hdnode>@ethersproject/signing-key": true,
-          "@ethersproject/hdnode>@ethersproject/transactions": true,
-          "@ethersproject/providers>@ethersproject/abstract-provider": true,
-          "@ethersproject/providers>@ethersproject/random": true,
-          "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers>@ethersproject/json-wallets": true
-        }
-      },
-      "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>js-sha3": {
-        "globals": {
-          "define": true
-        },
-        "packages": {
-          "browserify>process": true
-        }
-      },
-      "@truffle/decoder>@truffle/encoder>big.js": {
-        "globals": {
-          "define": true
-        }
-      },
-      "@truffle/decoder>@truffle/encoder>bignumber.js": {
-        "globals": {
-          "crypto": true,
-          "define": true
-        }
-      },
-      "@truffle/decoder>@truffle/source-map-utils": {
-        "packages": {
-          "@truffle/codec": true,
-          "@truffle/codec>web3-utils": true,
-          "@truffle/decoder>@truffle/source-map-utils>@truffle/code-utils": true,
-          "@truffle/decoder>@truffle/source-map-utils>json-pointer": true,
-          "@truffle/decoder>@truffle/source-map-utils>node-interval-tree": true,
-          "nock>debug": true
-        }
-      },
-      "@truffle/decoder>@truffle/source-map-utils>@truffle/code-utils": {
-        "packages": {
-          "@truffle/codec>cbor": true,
-          "browserify>buffer": true
-        }
-      },
-      "@truffle/decoder>@truffle/source-map-utils>json-pointer": {
-        "packages": {
-          "@truffle/decoder>@truffle/source-map-utils>json-pointer>foreach": true
-        }
-      },
-      "@truffle/decoder>@truffle/source-map-utils>node-interval-tree": {
-        "packages": {
-          "@storybook/addon-a11y>react-sizeme>shallowequal": true
-        }
-      },
-      "@truffle/decoder>bn.js": {
-        "globals": {
-          "Buffer": true
-        },
-        "packages": {
-          "browserify>browser-resolve": true
-        }
-      },
-      "@zxing/browser": {
-        "globals": {
-          "HTMLElement": true,
-          "HTMLImageElement": true,
-          "HTMLVideoElement": true,
-          "URL.createObjectURL": true,
-          "clearTimeout": true,
-          "console.error": true,
-          "console.warn": true,
-          "document": true,
-          "navigator": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "@zxing/library": true
-        }
-      },
-      "@zxing/library": {
-        "globals": {
-          "TextDecoder": true,
-          "TextEncoder": true,
-          "btoa": true,
-          "clearTimeout": true,
-          "define": true,
-          "document.createElement": true,
-          "document.createElementNS": true,
-          "document.getElementById": true,
-          "navigator.mediaDevices.enumerateDevices": true,
-          "navigator.mediaDevices.getUserMedia": true,
-          "setTimeout": true
-        }
-      },
-      "addons-linter>sha.js": {
-        "packages": {
-          "ethereumjs-wallet>safe-buffer": true,
-          "pumpify>inherits": true
-        }
-      },
-      "await-semaphore": {
-        "packages": {
-          "browserify>process": true,
-          "browserify>timers-browserify": true
-        }
-      },
-      "base32-encode": {
-        "packages": {
-          "base32-encode>to-data-view": true
-        }
-      },
-      "bignumber.js": {
-        "globals": {
-          "crypto": true,
-          "define": true
-        }
-      },
-      "bn.js": {
-        "globals": {
-          "Buffer": true
-        },
-        "packages": {
-          "browserify>browser-resolve": true
-        }
-      },
-      "bowser": {
-        "globals": {
-          "define": true
-        }
-      },
-      "browserify>assert": {
-        "globals": {
-          "Buffer": true
-        },
-        "packages": {
-          "browserify>assert>util": true,
-          "react>object-assign": true
-        }
-      },
-      "browserify>assert>util": {
-        "globals": {
-          "console.error": true,
-          "console.log": true,
-          "console.trace": true,
-          "process": true
-        },
-        "packages": {
-          "browserify>assert>util>inherits": true,
-          "browserify>process": true
-        }
-      },
-      "browserify>browser-resolve": {
-        "packages": {
-          "ethjs-query>babel-runtime>core-js": true
-        }
-      },
-      "browserify>buffer": {
-        "globals": {
-          "console": true
-        },
-        "packages": {
-          "base64-js": true,
-          "browserify>buffer>ieee754": true
-        }
-      },
-      "browserify>crypto-browserify": {
-        "packages": {
-          "browserify>crypto-browserify>browserify-cipher": true,
-          "browserify>crypto-browserify>browserify-sign": true,
-          "browserify>crypto-browserify>create-ecdh": true,
-          "browserify>crypto-browserify>create-hmac": true,
-          "browserify>crypto-browserify>diffie-hellman": true,
-          "browserify>crypto-browserify>pbkdf2": true,
-          "browserify>crypto-browserify>public-encrypt": true,
-          "browserify>crypto-browserify>randomfill": true,
-          "ethereumjs-util>create-hash": true,
-          "ethereumjs-wallet>randombytes": true
-        }
-      },
-      "browserify>crypto-browserify>browserify-cipher": {
-        "packages": {
-          "browserify>crypto-browserify>browserify-cipher>browserify-des": true,
-          "browserify>crypto-browserify>browserify-cipher>evp_bytestokey": true,
-          "ethereumjs-util>ethereum-cryptography>browserify-aes": true
-        }
-      },
-      "browserify>crypto-browserify>browserify-cipher>browserify-des": {
-        "packages": {
-          "browserify>buffer": true,
-          "browserify>crypto-browserify>browserify-cipher>browserify-des>des.js": true,
-          "ethereumjs-util>create-hash>cipher-base": true,
-          "pumpify>inherits": true
-        }
-      },
-      "browserify>crypto-browserify>browserify-cipher>browserify-des>des.js": {
-        "packages": {
-          "ganache>secp256k1>elliptic>minimalistic-assert": true,
-          "pumpify>inherits": true
-        }
-      },
-      "browserify>crypto-browserify>browserify-cipher>evp_bytestokey": {
-        "packages": {
-          "ethereumjs-util>create-hash>md5.js": true,
-          "ethereumjs-wallet>safe-buffer": true
-        }
-      },
-      "browserify>crypto-browserify>browserify-sign": {
-        "packages": {
-          "bn.js": true,
-          "browserify>buffer": true,
-          "browserify>crypto-browserify>create-hmac": true,
-          "browserify>crypto-browserify>public-encrypt>browserify-rsa": true,
-          "browserify>crypto-browserify>public-encrypt>parse-asn1": true,
-          "browserify>stream-browserify": true,
-          "ethereumjs-util>create-hash": true,
-          "ganache>secp256k1>elliptic": true,
-          "pumpify>inherits": true
-        }
-      },
-      "browserify>crypto-browserify>create-ecdh": {
-        "packages": {
-          "bn.js": true,
-          "browserify>buffer": true,
-          "ganache>secp256k1>elliptic": true
-        }
-      },
-      "browserify>crypto-browserify>create-hmac": {
-        "packages": {
-          "addons-linter>sha.js": true,
-          "ethereumjs-util>create-hash": true,
-          "ethereumjs-util>create-hash>cipher-base": true,
-          "ethereumjs-util>create-hash>ripemd160": true,
-          "ethereumjs-wallet>safe-buffer": true,
-          "pumpify>inherits": true
-        }
-      },
-      "browserify>crypto-browserify>diffie-hellman": {
-        "packages": {
-          "bn.js": true,
-          "browserify>buffer": true,
-          "browserify>crypto-browserify>diffie-hellman>miller-rabin": true,
-          "ethereumjs-wallet>randombytes": true
-        }
-      },
-      "browserify>crypto-browserify>diffie-hellman>miller-rabin": {
-        "packages": {
-          "bn.js": true,
-          "ganache>secp256k1>elliptic>brorand": true
-        }
-      },
-      "browserify>crypto-browserify>pbkdf2": {
-        "globals": {
-          "crypto": true,
-          "process": true,
-          "queueMicrotask": true,
-          "setImmediate": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "addons-linter>sha.js": true,
-          "browserify>process": true,
-          "ethereumjs-util>create-hash": true,
-          "ethereumjs-util>create-hash>ripemd160": true,
-          "ethereumjs-wallet>safe-buffer": true
-        }
-      },
-      "browserify>crypto-browserify>public-encrypt": {
-        "packages": {
-          "bn.js": true,
-          "browserify>buffer": true,
-          "browserify>crypto-browserify>public-encrypt>browserify-rsa": true,
-          "browserify>crypto-browserify>public-encrypt>parse-asn1": true,
-          "ethereumjs-util>create-hash": true,
-          "ethereumjs-wallet>randombytes": true
-        }
-      },
-      "browserify>crypto-browserify>public-encrypt>browserify-rsa": {
-        "packages": {
-          "bn.js": true,
-          "browserify>buffer": true,
-          "ethereumjs-wallet>randombytes": true
-        }
-      },
-      "browserify>crypto-browserify>public-encrypt>parse-asn1": {
-        "packages": {
-          "browserify>buffer": true,
-          "browserify>crypto-browserify>browserify-cipher>evp_bytestokey": true,
-          "browserify>crypto-browserify>pbkdf2": true,
-          "browserify>crypto-browserify>public-encrypt>parse-asn1>asn1.js": true,
-          "ethereumjs-util>ethereum-cryptography>browserify-aes": true
-        }
-      },
-      "browserify>crypto-browserify>public-encrypt>parse-asn1>asn1.js": {
-        "packages": {
-          "bn.js": true,
-          "browserify>buffer": true,
-          "browserify>vm-browserify": true,
-          "ganache>secp256k1>elliptic>minimalistic-assert": true,
-          "pumpify>inherits": true
-        }
-      },
-      "browserify>crypto-browserify>randomfill": {
-        "globals": {
-          "crypto": true,
-          "msCrypto": true
-        },
-        "packages": {
-          "browserify>process": true,
-          "ethereumjs-wallet>randombytes": true,
-          "ethereumjs-wallet>safe-buffer": true
-        }
-      },
-      "browserify>events": {
-        "globals": {
-          "console": true
-        }
-      },
-      "browserify>os-browserify": {
-        "globals": {
-          "location": true,
-          "navigator": true
-        }
-      },
-      "browserify>path-browserify": {
-        "packages": {
-          "browserify>process": true
-        }
-      },
-      "browserify>process": {
-        "globals": {
-          "clearTimeout": true,
-          "setTimeout": true
-        }
-      },
-      "browserify>punycode": {
-        "globals": {
-          "define": true
-        }
-      },
-      "browserify>stream-browserify": {
-        "packages": {
-          "browserify>events": true,
-          "pumpify>inherits": true,
-          "readable-stream": true
-        }
-      },
-      "browserify>string_decoder": {
-        "packages": {
-          "ethereumjs-wallet>safe-buffer": true
-        }
-      },
-      "browserify>timers-browserify": {
-        "globals": {
-          "clearInterval": true,
-          "clearTimeout": true,
-          "setInterval": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "browserify>process": true
-        }
-      },
-      "browserify>url": {
-        "packages": {
-          "browserify>punycode": true,
-          "browserify>querystring-es3": true
-        }
-      },
-      "browserify>util": {
-        "globals": {
-          "console.error": true,
-          "console.log": true,
-          "console.trace": true,
-          "process": true
-        },
-        "packages": {
-          "browserify>process": true,
-          "browserify>util>inherits": true
-        }
-      },
-      "browserify>vm-browserify": {
-        "globals": {
-          "document.body.appendChild": true,
-          "document.body.removeChild": true,
-          "document.createElement": true
-        }
-      },
-      "classnames": {
-        "globals": {
-          "classNames": "write",
-          "define": true
-        }
-      },
-      "copy-to-clipboard": {
-        "globals": {
-          "clipboardData": true,
-          "console.error": true,
-          "console.warn": true,
-          "document.body.appendChild": true,
-          "document.body.removeChild": true,
-          "document.createElement": true,
-          "document.createRange": true,
-          "document.execCommand": true,
-          "document.getSelection": true,
-          "navigator.userAgent": true,
-          "prompt": true
-        },
-        "packages": {
-          "copy-to-clipboard>toggle-selection": true
-        }
-      },
-      "copy-to-clipboard>toggle-selection": {
-        "globals": {
-          "document.activeElement": true,
-          "document.getSelection": true
-        }
-      },
-      "currency-formatter": {
-        "packages": {
-          "currency-formatter>accounting": true,
-          "currency-formatter>locale-currency": true,
-          "react>object-assign": true
-        }
-      },
-      "currency-formatter>accounting": {
-        "globals": {
-          "define": true
-        }
-      },
-      "currency-formatter>locale-currency": {
-        "globals": {
-          "countryCode": true
-        }
-      },
-      "debounce-stream": {
-        "packages": {
-          "debounce-stream>debounce": true,
-          "debounce-stream>duplexer": true,
-          "debounce-stream>through": true
-        }
-      },
-      "debounce-stream>debounce": {
-        "globals": {
-          "clearTimeout": true,
-          "setTimeout": true
-        }
-      },
-      "debounce-stream>duplexer": {
-        "packages": {
-          "browserify>stream-browserify": true
-        }
-      },
-      "debounce-stream>through": {
-        "packages": {
-          "browserify>process": true,
-          "browserify>stream-browserify": true
-        }
-      },
-      "depcheck>@vue/compiler-sfc>postcss>nanoid": {
-        "globals": {
-          "crypto.getRandomValues": true
-        }
-      },
-      "dependency-tree>precinct>detective-postcss>postcss>nanoid": {
-        "globals": {
-          "crypto.getRandomValues": true
-        }
-      },
-      "end-of-stream": {
-        "packages": {
-          "browserify>process": true,
-          "pump>once": true
-        }
-      },
-      "enzyme>cheerio>tslib": {
-        "globals": {
-          "define": true
-        }
-      },
-      "enzyme>has": {
-        "packages": {
-          "mocha>object.assign>function-bind": true
-        }
-      },
-      "enzyme>is-regex": {
-        "packages": {
-          "koa>is-generator-function>has-tostringtag": true,
-          "string.prototype.matchall>call-bind": true
-        }
-      },
-      "enzyme>object-is": {
-        "packages": {
-          "globalthis>define-properties": true,
-          "string.prototype.matchall>call-bind": true
-        }
-      },
-      "eslint>optionator>fast-levenshtein": {
-        "globals": {
-          "Intl": true,
-          "Levenshtein": "write",
-          "console.log": true,
-          "define": true,
-          "importScripts": true,
-          "postMessage": true
-        }
-      },
-      "eth-block-tracker": {
-        "globals": {
-          "clearTimeout": true,
-          "console.error": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "@metamask/utils": true,
-          "eth-block-tracker>pify": true,
-          "eth-query>json-rpc-random-id": true,
-          "json-rpc-engine>@metamask/safe-event-emitter": true
-        }
-      },
-      "eth-ens-namehash": {
-        "globals": {
-          "name": "write"
-        },
-        "packages": {
-          "browserify>buffer": true,
-          "eth-ens-namehash>idna-uts46-hx": true,
-          "eth-ens-namehash>js-sha3": true
-        }
-      },
-      "eth-ens-namehash>idna-uts46-hx": {
-        "globals": {
-          "define": true
-        },
-        "packages": {
-          "browserify>punycode": true
-        }
-      },
-      "eth-ens-namehash>js-sha3": {
-        "packages": {
-          "browserify>process": true
-        }
-      },
-      "eth-json-rpc-filters": {
-        "globals": {
-          "console.error": true
-        },
-        "packages": {
-          "eth-json-rpc-filters>async-mutex": true,
-          "eth-query": true,
-          "json-rpc-engine": true,
-          "json-rpc-engine>@metamask/safe-event-emitter": true,
-          "pify": true
-        }
-      },
-      "eth-json-rpc-filters>async-mutex": {
-        "globals": {
-          "setTimeout": true
-        },
-        "packages": {
-          "enzyme>cheerio>tslib": true
-        }
-      },
-      "eth-json-rpc-middleware": {
-        "globals": {
-          "URL": true,
-          "btoa": true,
-          "console.error": true,
-          "fetch": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "@metamask/utils": true,
-          "browserify>browser-resolve": true,
-          "eth-json-rpc-middleware>@metamask/eth-sig-util": true,
-          "eth-json-rpc-middleware>pify": true,
-          "eth-rpc-errors": true,
-          "json-rpc-engine": true,
-          "json-rpc-engine>@metamask/safe-event-emitter": true,
-          "lavamoat>json-stable-stringify": true,
-          "vinyl>clone": true
-        }
-      },
-      "eth-json-rpc-middleware>@metamask/eth-sig-util": {
-        "packages": {
-          "bn.js": true,
-          "browserify>buffer": true,
-          "eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography": true,
-          "eth-json-rpc-middleware>@metamask/eth-sig-util>ethjs-util": true,
-          "eth-lattice-keyring>@ethereumjs/util": true,
-          "eth-sig-util>tweetnacl": true,
-          "eth-sig-util>tweetnacl-util": true
-        }
-      },
-      "eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography": {
-        "globals": {
-          "TextDecoder": true,
-          "crypto": true
-        },
-        "packages": {
-          "eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography>@noble/hashes": true
-        }
-      },
-      "eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography>@noble/hashes": {
-        "globals": {
-          "TextEncoder": true,
-          "crypto": true
-        }
-      },
-      "eth-json-rpc-middleware>@metamask/eth-sig-util>ethjs-util": {
-        "packages": {
-          "browserify>buffer": true,
-          "ethjs>ethjs-util>is-hex-prefixed": true,
-          "ethjs>ethjs-util>strip-hex-prefix": true
-        }
-      },
-      "eth-keyring-controller>@metamask/browser-passworder": {
-        "globals": {
-          "crypto": true
-        }
-      },
-      "eth-lattice-keyring": {
-        "globals": {
-          "addEventListener": true,
-          "browser": true,
-          "clearInterval": true,
-          "fetch": true,
-          "open": true,
-          "setInterval": true
-        },
-        "packages": {
-          "browserify>buffer": true,
-          "browserify>crypto-browserify": true,
-          "browserify>events": true,
-          "eth-lattice-keyring>@ethereumjs/tx": true,
-          "eth-lattice-keyring>@ethereumjs/util": true,
-          "eth-lattice-keyring>bn.js": true,
-          "eth-lattice-keyring>gridplus-sdk": true,
-          "eth-lattice-keyring>rlp": true
-        }
-      },
-      "eth-lattice-keyring>@ethereumjs/tx": {
-        "packages": {
-          "@ethereumjs/common": true,
-          "browserify>buffer": true,
-          "browserify>insert-module-globals>is-buffer": true,
-          "ethereumjs-util": true
-        }
-      },
-      "eth-lattice-keyring>@ethereumjs/util": {
-        "globals": {
-          "console.warn": true
-        },
-        "packages": {
-          "browserify>buffer": true,
-          "browserify>events": true,
-          "browserify>insert-module-globals>is-buffer": true,
-          "eth-lattice-keyring>@ethereumjs/util>@ethereumjs/rlp": true,
-          "eth-lattice-keyring>@ethereumjs/util>async": true,
-          "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography": true
-        }
-      },
-      "eth-lattice-keyring>@ethereumjs/util>@ethereumjs/rlp": {
-        "globals": {
-          "TextEncoder": true
-        }
-      },
-      "eth-lattice-keyring>@ethereumjs/util>async": {
-        "globals": {
-          "clearTimeout": true,
-          "console": true,
-          "define": true,
-          "queueMicrotask": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "browserify>process": true,
-          "browserify>timers-browserify": true
-        }
-      },
-      "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography": {
-        "globals": {
-          "TextDecoder": true,
-          "crypto": true
-        },
-        "packages": {
-          "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/hashes": true,
-          "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": true
-        }
-      },
-      "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/hashes": {
-        "globals": {
-          "TextEncoder": true,
-          "crypto": true
-        }
-      },
-      "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": {
-        "globals": {
-          "crypto": true
-        },
-        "packages": {
-          "browserify>browser-resolve": true
-        }
-      },
-      "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@scure/bip32": {
-        "packages": {
-          "@metamask/snaps-utils>@noble/hashes": true,
-          "@metamask/snaps-utils>@scure/base": true,
-          "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": true
-        }
-      },
-      "eth-lattice-keyring>bn.js": {
-        "globals": {
-          "Buffer": true
-        },
-        "packages": {
-          "browserify>browser-resolve": true
-        }
-      },
-      "eth-lattice-keyring>gridplus-sdk": {
-        "globals": {
-          "AbortController": true,
-          "Request": true,
-          "__values": true,
-          "caches": true,
-          "clearTimeout": true,
-          "console.error": true,
-          "console.log": true,
-          "console.warn": true,
-          "fetch": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "@ethereumjs/common>crc-32": true,
-          "@ethersproject/abi": true,
-          "bn.js": true,
-          "browserify>buffer": true,
-          "browserify>process": true,
-          "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true,
-          "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": true,
-          "eth-lattice-keyring>gridplus-sdk>bech32": true,
-          "eth-lattice-keyring>gridplus-sdk>bignumber.js": true,
-          "eth-lattice-keyring>gridplus-sdk>bitwise": true,
-          "eth-lattice-keyring>gridplus-sdk>borc": true,
-          "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true,
-          "eth-lattice-keyring>gridplus-sdk>js-sha3": true,
-          "eth-lattice-keyring>gridplus-sdk>rlp": true,
-          "eth-lattice-keyring>gridplus-sdk>secp256k1": true,
-          "eth-lattice-keyring>gridplus-sdk>uuid": true,
-          "ethereumjs-util>ethereum-cryptography>hash.js": true,
-          "ethereumjs-wallet>aes-js": true,
-          "ethereumjs-wallet>bs58check": true,
-          "ganache>secp256k1>elliptic": true,
-          "lodash": true
-        }
-      },
-      "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": {
-        "packages": {
-          "@ethereumjs/common>crc-32": true,
-          "browserify>buffer": true,
-          "browserify>events": true,
-          "ethereumjs-util": true
-        }
-      },
-      "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": {
-        "packages": {
-          "browserify>buffer": true,
-          "browserify>insert-module-globals>is-buffer": true,
-          "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": true,
-          "ethereumjs-util": true
-        }
-      },
-      "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": {
-        "packages": {
-          "@ethereumjs/common>crc-32": true,
-          "browserify>buffer": true,
-          "browserify>events": true,
-          "ethereumjs-util": true
-        }
-      },
-      "eth-lattice-keyring>gridplus-sdk>bignumber.js": {
-        "globals": {
-          "crypto": true,
-          "define": true
-        }
-      },
-      "eth-lattice-keyring>gridplus-sdk>bitwise": {
-        "packages": {
-          "browserify>buffer": true
-        }
-      },
-      "eth-lattice-keyring>gridplus-sdk>borc": {
-        "globals": {
-          "console": true
-        },
-        "packages": {
-          "browserify>buffer": true,
-          "browserify>buffer>ieee754": true,
-          "eth-lattice-keyring>gridplus-sdk>borc>bignumber.js": true,
-          "eth-lattice-keyring>gridplus-sdk>borc>iso-url": true
-        }
-      },
-      "eth-lattice-keyring>gridplus-sdk>borc>bignumber.js": {
-        "globals": {
-          "crypto": true,
-          "define": true
-        }
-      },
-      "eth-lattice-keyring>gridplus-sdk>borc>iso-url": {
-        "globals": {
-          "URL": true,
-          "URLSearchParams": true,
-          "location": true
-        }
-      },
-      "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": {
-        "globals": {
-          "intToBuffer": true
-        },
-        "packages": {
-          "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>bn.js": true,
-          "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>buffer": true,
-          "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>js-sha3": true
-        }
-      },
-      "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>bn.js": {
-        "globals": {
-          "Buffer": true
-        },
-        "packages": {
-          "browserify>browser-resolve": true
-        }
-      },
-      "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>buffer": {
-        "globals": {
-          "console": true
-        },
-        "packages": {
-          "base64-js": true,
-          "browserify>buffer>ieee754": true
-        }
-      },
-      "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>js-sha3": {
-        "globals": {
-          "define": true
-        },
-        "packages": {
-          "browserify>process": true
-        }
-      },
-      "eth-lattice-keyring>gridplus-sdk>js-sha3": {
-        "globals": {
-          "define": true
-        },
-        "packages": {
-          "browserify>process": true
-        }
-      },
-      "eth-lattice-keyring>gridplus-sdk>rlp": {
-        "globals": {
-          "TextEncoder": true
-        }
-      },
-      "eth-lattice-keyring>gridplus-sdk>secp256k1": {
-        "packages": {
-          "ganache>secp256k1>elliptic": true
-        }
-      },
-      "eth-lattice-keyring>gridplus-sdk>uuid": {
-        "globals": {
-          "crypto": true
-        }
-      },
-      "eth-lattice-keyring>rlp": {
-        "globals": {
-          "TextEncoder": true
-        }
-      },
-      "eth-method-registry": {
-        "packages": {
-          "ethjs": true
-        }
-      },
-      "eth-query": {
-        "packages": {
-          "eth-query>json-rpc-random-id": true,
-          "nock>debug": true,
-          "watchify>xtend": true
-        }
-      },
-      "eth-rpc-errors": {
-        "packages": {
-          "eth-rpc-errors>fast-safe-stringify": true
-        }
-      },
-      "eth-sig-util": {
-        "packages": {
-          "browserify>buffer": true,
-          "eth-sig-util>ethereumjs-util": true,
-          "eth-sig-util>tweetnacl": true,
-          "eth-sig-util>tweetnacl-util": true,
-          "ethereumjs-abi": true
-        }
-      },
-      "eth-sig-util>ethereumjs-util": {
-        "packages": {
-          "bn.js": true,
-          "browserify>assert": true,
-          "browserify>buffer": true,
-          "eth-sig-util>ethereumjs-util>ethjs-util": true,
-          "ethereumjs-util>create-hash": true,
-          "ethereumjs-util>ethereum-cryptography": true,
-          "ethereumjs-util>rlp": true,
-          "ethereumjs-wallet>safe-buffer": true,
-          "ganache>secp256k1>elliptic": true
-        }
-      },
-      "eth-sig-util>ethereumjs-util>ethjs-util": {
-        "packages": {
-          "browserify>buffer": true,
-          "ethjs>ethjs-util>is-hex-prefixed": true,
-          "ethjs>ethjs-util>strip-hex-prefix": true
-        }
-      },
-      "eth-sig-util>tweetnacl": {
-        "globals": {
-          "crypto": true,
-          "msCrypto": true,
-          "nacl": "write"
-        },
-        "packages": {
-          "browserify>browser-resolve": true
-        }
-      },
-      "eth-sig-util>tweetnacl-util": {
-        "globals": {
-          "atob": true,
-          "btoa": true
-        },
-        "packages": {
-          "browserify>browser-resolve": true
-        }
-      },
-      "eth-trezor-keyring": {
-        "globals": {
-          "setTimeout": true
-        },
-        "packages": {
-          "@ethereumjs/tx": true,
-          "browserify>buffer": true,
-          "browserify>events": true,
-          "eth-trezor-keyring>hdkey": true,
-          "eth-trezor-keyring>trezor-connect": true,
-          "ethereumjs-util": true
-        }
-      },
-      "eth-trezor-keyring>hdkey": {
-        "packages": {
-          "browserify>assert": true,
-          "browserify>crypto-browserify": true,
-          "eth-trezor-keyring>hdkey>coinstring": true,
-          "eth-trezor-keyring>hdkey>secp256k1": true,
-          "ethereumjs-wallet>safe-buffer": true
-        }
-      },
-      "eth-trezor-keyring>hdkey>coinstring": {
-        "packages": {
-          "browserify>buffer": true,
-          "eth-trezor-keyring>hdkey>coinstring>bs58": true,
-          "ethereumjs-util>create-hash": true
-        }
-      },
-      "eth-trezor-keyring>hdkey>secp256k1": {
-        "packages": {
-          "bn.js": true,
-          "browserify>insert-module-globals>is-buffer": true,
-          "eth-trezor-keyring>hdkey>secp256k1>bip66": true,
-          "ethereumjs-util>create-hash": true,
-          "ethereumjs-wallet>safe-buffer": true,
-          "ganache>secp256k1>elliptic": true
-        }
-      },
-      "eth-trezor-keyring>hdkey>secp256k1>bip66": {
-        "packages": {
-          "ethereumjs-wallet>safe-buffer": true
-        }
-      },
-      "eth-trezor-keyring>trezor-connect": {
-        "globals": {
-          "__TREZOR_CONNECT_SRC": true,
-          "addEventListener": true,
-          "btoa": true,
-          "chrome": true,
-          "clearInterval": true,
-          "clearTimeout": true,
-          "console": true,
-          "document.body": true,
-          "document.createElement": true,
-          "document.createTextNode": true,
-          "document.getElementById": true,
-          "document.querySelectorAll": true,
-          "location": true,
-          "navigator": true,
-          "open": true,
-          "removeEventListener": true,
-          "setInterval": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "@babel/runtime": true,
-          "browserify>events": true,
-          "eth-json-rpc-middleware>@metamask/eth-sig-util": true,
-          "eth-trezor-keyring>trezor-connect>cross-fetch": true
-        }
-      },
-      "eth-trezor-keyring>trezor-connect>cross-fetch": {
-        "globals": {
-          "Blob": true,
-          "FileReader": true,
-          "FormData": true,
-          "URLSearchParams.prototype.isPrototypeOf": true,
-          "XMLHttpRequest": true
-        }
-      },
-      "ethereumjs-abi": {
-        "packages": {
-          "bn.js": true,
-          "browserify>buffer": true,
-          "ethereumjs-abi>ethereumjs-util": true
-        }
-      },
-      "ethereumjs-abi>ethereumjs-util": {
-        "packages": {
-          "bn.js": true,
-          "browserify>assert": true,
-          "browserify>buffer": true,
-          "ethereumjs-abi>ethereumjs-util>ethjs-util": true,
-          "ethereumjs-util>create-hash": true,
-          "ethereumjs-util>ethereum-cryptography": true,
-          "ethereumjs-util>rlp": true,
-          "ganache>secp256k1>elliptic": true
-        }
-      },
-      "ethereumjs-abi>ethereumjs-util>ethjs-util": {
-        "packages": {
-          "browserify>buffer": true,
-          "ethjs>ethjs-util>is-hex-prefixed": true,
-          "ethjs>ethjs-util>strip-hex-prefix": true
-        }
-      },
-      "ethereumjs-util": {
-        "packages": {
-          "browserify>assert": true,
-          "browserify>buffer": true,
-          "browserify>insert-module-globals>is-buffer": true,
-          "ethereumjs-util>bn.js": true,
-          "ethereumjs-util>create-hash": true,
-          "ethereumjs-util>ethereum-cryptography": true,
-          "ethereumjs-util>rlp": true
-        }
-      },
-      "ethereumjs-util>bn.js": {
-        "globals": {
-          "Buffer": true
-        },
-        "packages": {
-          "browserify>browser-resolve": true
-        }
-      },
-      "ethereumjs-util>create-hash": {
-        "packages": {
-          "addons-linter>sha.js": true,
-          "ethereumjs-util>create-hash>cipher-base": true,
-          "ethereumjs-util>create-hash>md5.js": true,
-          "ethereumjs-util>create-hash>ripemd160": true,
-          "pumpify>inherits": true
-        }
-      },
-      "ethereumjs-util>create-hash>cipher-base": {
-        "packages": {
-          "browserify>stream-browserify": true,
-          "browserify>string_decoder": true,
-          "ethereumjs-wallet>safe-buffer": true,
-          "pumpify>inherits": true
-        }
-      },
-      "ethereumjs-util>create-hash>md5.js": {
-        "packages": {
-          "ethereumjs-util>create-hash>md5.js>hash-base": true,
-          "ethereumjs-wallet>safe-buffer": true,
-          "pumpify>inherits": true
-        }
-      },
-      "ethereumjs-util>create-hash>md5.js>hash-base": {
-        "packages": {
-          "ethereumjs-util>create-hash>md5.js>hash-base>readable-stream": true,
-          "ethereumjs-wallet>safe-buffer": true,
-          "pumpify>inherits": true
-        }
-      },
-      "ethereumjs-util>create-hash>md5.js>hash-base>readable-stream": {
-        "packages": {
-          "@storybook/api>util-deprecate": true,
-          "browserify>browser-resolve": true,
-          "browserify>buffer": true,
-          "browserify>events": true,
-          "browserify>process": true,
-          "browserify>string_decoder": true,
-          "pumpify>inherits": true
-        }
-      },
-      "ethereumjs-util>create-hash>ripemd160": {
-        "packages": {
-          "browserify>buffer": true,
-          "ethereumjs-util>create-hash>md5.js>hash-base": true,
-          "pumpify>inherits": true
-        }
-      },
-      "ethereumjs-util>ethereum-cryptography": {
-        "packages": {
-          "browserify>buffer": true,
-          "ethereumjs-util>ethereum-cryptography>keccak": true,
-          "ethereumjs-util>ethereum-cryptography>secp256k1": true,
-          "ethereumjs-wallet>randombytes": true
-        }
-      },
-      "ethereumjs-util>ethereum-cryptography>browserify-aes": {
-        "packages": {
-          "browserify>buffer": true,
-          "browserify>crypto-browserify>browserify-cipher>evp_bytestokey": true,
-          "ethereumjs-util>create-hash>cipher-base": true,
-          "ethereumjs-util>ethereum-cryptography>browserify-aes>buffer-xor": true,
-          "ethereumjs-wallet>safe-buffer": true,
-          "pumpify>inherits": true
-        }
-      },
-      "ethereumjs-util>ethereum-cryptography>browserify-aes>buffer-xor": {
-        "packages": {
-          "browserify>buffer": true
-        }
-      },
-      "ethereumjs-util>ethereum-cryptography>hash.js": {
-        "packages": {
-          "ganache>secp256k1>elliptic>minimalistic-assert": true,
-          "pumpify>inherits": true
-        }
-      },
-      "ethereumjs-util>ethereum-cryptography>keccak": {
-        "packages": {
-          "browserify>buffer": true,
-          "ethereumjs-util>ethereum-cryptography>keccak>readable-stream": true
-        }
-      },
-      "ethereumjs-util>ethereum-cryptography>keccak>readable-stream": {
-        "packages": {
-          "@storybook/api>util-deprecate": true,
-          "browserify>browser-resolve": true,
-          "browserify>buffer": true,
-          "browserify>events": true,
-          "browserify>process": true,
-          "browserify>string_decoder": true,
-          "pumpify>inherits": true
-        }
-      },
-      "ethereumjs-util>ethereum-cryptography>scrypt-js": {
-        "globals": {
-          "define": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "browserify>timers-browserify": true
-        }
-      },
-      "ethereumjs-util>ethereum-cryptography>secp256k1": {
-        "packages": {
-          "ganache>secp256k1>elliptic": true
-        }
-      },
-      "ethereumjs-util>rlp": {
-        "packages": {
-          "browserify>buffer": true,
-          "ethereumjs-util>rlp>bn.js": true
-        }
-      },
-      "ethereumjs-util>rlp>bn.js": {
-        "globals": {
-          "Buffer": true
-        },
-        "packages": {
-          "browserify>browser-resolve": true
-        }
-      },
-      "ethereumjs-wallet": {
-        "packages": {
-          "@truffle/codec>utf8": true,
-          "browserify>crypto-browserify": true,
-          "ethereumjs-wallet>aes-js": true,
-          "ethereumjs-wallet>bs58check": true,
-          "ethereumjs-wallet>ethereumjs-util": true,
-          "ethereumjs-wallet>randombytes": true,
-          "ethereumjs-wallet>safe-buffer": true,
-          "ethereumjs-wallet>scryptsy": true,
-          "ethereumjs-wallet>uuid": true
-        }
-      },
-      "ethereumjs-wallet>aes-js": {
-        "globals": {
-          "define": true
-        }
-      },
-      "ethereumjs-wallet>bs58check": {
-        "packages": {
-          "ethereumjs-util>create-hash": true,
-          "ethereumjs-wallet>bs58check>bs58": true,
-          "ethereumjs-wallet>safe-buffer": true
-        }
-      },
-      "ethereumjs-wallet>bs58check>bs58": {
-        "packages": {
-          "ethereumjs-wallet>bs58check>bs58>base-x": true
-        }
-      },
-      "ethereumjs-wallet>bs58check>bs58>base-x": {
-        "packages": {
-          "ethereumjs-wallet>safe-buffer": true
-        }
-      },
-      "ethereumjs-wallet>ethereumjs-util": {
-        "packages": {
-          "bn.js": true,
-          "browserify>assert": true,
-          "browserify>buffer": true,
-          "ethereumjs-util>create-hash": true,
-          "ethereumjs-util>ethereum-cryptography": true,
-          "ethereumjs-util>rlp": true,
-          "ethereumjs-wallet>ethereumjs-util>ethjs-util": true,
-          "ganache>secp256k1>elliptic": true
-        }
-      },
-      "ethereumjs-wallet>ethereumjs-util>ethjs-util": {
-        "packages": {
-          "browserify>buffer": true,
-          "ethjs>ethjs-util>is-hex-prefixed": true,
-          "ethjs>ethjs-util>strip-hex-prefix": true
-        }
-      },
-      "ethereumjs-wallet>randombytes": {
-        "globals": {
-          "crypto": true,
-          "msCrypto": true
-        },
-        "packages": {
-          "browserify>process": true,
-          "ethereumjs-wallet>safe-buffer": true
-        }
-      },
-      "ethereumjs-wallet>safe-buffer": {
-        "packages": {
-          "browserify>buffer": true
-        }
-      },
-      "ethereumjs-wallet>scryptsy": {
-        "packages": {
-          "browserify>buffer": true,
-          "browserify>crypto-browserify>pbkdf2": true
-        }
-      },
-      "ethereumjs-wallet>uuid": {
-        "globals": {
-          "crypto": true,
-          "msCrypto": true
-        }
-      },
-      "ethers>@ethersproject/random": {
-        "globals": {
-          "crypto.getRandomValues": true
-        }
-      },
-      "ethjs": {
-        "globals": {
-          "clearInterval": true,
-          "setInterval": true
-        },
-        "packages": {
-          "browserify>buffer": true,
-          "ethjs-contract": true,
-          "ethjs-query": true,
-          "ethjs>bn.js": true,
-          "ethjs>ethjs-abi": true,
-          "ethjs>ethjs-filter": true,
-          "ethjs>ethjs-provider-http": true,
-          "ethjs>ethjs-unit": true,
-          "ethjs>ethjs-util": true,
-          "ethjs>js-sha3": true,
-          "ethjs>number-to-bn": true
-        }
-      },
-      "ethjs-contract": {
-        "packages": {
-          "ethjs-contract>ethjs-abi": true,
-          "ethjs-query>babel-runtime": true,
-          "ethjs>ethjs-filter": true,
-          "ethjs>ethjs-util": true,
-          "ethjs>js-sha3": true,
-          "promise-to-callback": true
-        }
-      },
-      "ethjs-contract>ethjs-abi": {
-        "packages": {
-          "browserify>buffer": true,
-          "ethjs-contract>ethjs-abi>bn.js": true,
-          "ethjs>js-sha3": true,
-          "ethjs>number-to-bn": true
-        }
-      },
-      "ethjs-query": {
-        "globals": {
-          "console": true
-        },
-        "packages": {
-          "ethjs-query>ethjs-format": true,
-          "ethjs-query>ethjs-rpc": true,
-          "promise-to-callback": true
-        }
-      },
-      "ethjs-query>babel-runtime": {
-        "packages": {
-          "@babel/runtime": true,
-          "@storybook/api>regenerator-runtime": true,
-          "ethjs-query>babel-runtime>core-js": true
-        }
-      },
-      "ethjs-query>babel-runtime>core-js": {
-        "globals": {
-          "PromiseRejectionEvent": true,
-          "__e": "write",
-          "__g": "write",
-          "document.createTextNode": true,
-          "postMessage": true,
-          "setTimeout": true
-        }
-      },
-      "ethjs-query>ethjs-format": {
-        "packages": {
-          "ethjs-query>ethjs-format>ethjs-schema": true,
-          "ethjs>ethjs-util": true,
-          "ethjs>ethjs-util>strip-hex-prefix": true,
-          "ethjs>number-to-bn": true
-        }
-      },
-      "ethjs-query>ethjs-rpc": {
-        "packages": {
-          "promise-to-callback": true
-        }
-      },
-      "ethjs>ethjs-abi": {
-        "packages": {
-          "browserify>buffer": true,
-          "ethjs>bn.js": true,
-          "ethjs>js-sha3": true,
-          "ethjs>number-to-bn": true
-        }
-      },
-      "ethjs>ethjs-filter": {
-        "globals": {
-          "clearInterval": true,
-          "setInterval": true
-        }
-      },
-      "ethjs>ethjs-provider-http": {
-        "packages": {
-          "ethjs>ethjs-provider-http>xhr2": true
-        }
-      },
-      "ethjs>ethjs-provider-http>xhr2": {
-        "globals": {
-          "XMLHttpRequest": true
-        }
-      },
-      "ethjs>ethjs-unit": {
-        "packages": {
-          "ethjs>ethjs-unit>bn.js": true,
-          "ethjs>number-to-bn": true
-        }
-      },
-      "ethjs>ethjs-util": {
-        "packages": {
-          "browserify>buffer": true,
-          "ethjs>ethjs-util>is-hex-prefixed": true,
-          "ethjs>ethjs-util>strip-hex-prefix": true
-        }
-      },
-      "ethjs>ethjs-util>strip-hex-prefix": {
-        "packages": {
-          "ethjs>ethjs-util>is-hex-prefixed": true
-        }
-      },
-      "ethjs>js-sha3": {
-        "packages": {
-          "browserify>process": true
-        }
-      },
-      "ethjs>number-to-bn": {
-        "packages": {
-          "ethjs>ethjs-util>strip-hex-prefix": true,
-          "ethjs>number-to-bn>bn.js": true
-        }
-      },
-      "extension-port-stream": {
-        "packages": {
-          "browserify>buffer": true,
-          "browserify>stream-browserify": true
-        }
-      },
-      "fast-json-patch": {
-        "globals": {
-          "addEventListener": true,
-          "clearTimeout": true,
-          "removeEventListener": true,
-          "setTimeout": true
-        }
-      },
-      "fuse.js": {
-        "globals": {
-          "console": true,
-          "define": true
-        }
-      },
-      "ganache>secp256k1>elliptic": {
-        "packages": {
-          "bn.js": true,
-          "ethereumjs-util>ethereum-cryptography>hash.js": true,
-          "ganache>secp256k1>elliptic>brorand": true,
-          "ganache>secp256k1>elliptic>hmac-drbg": true,
-          "ganache>secp256k1>elliptic>minimalistic-assert": true,
-          "ganache>secp256k1>elliptic>minimalistic-crypto-utils": true,
-          "pumpify>inherits": true
-        }
-      },
-      "ganache>secp256k1>elliptic>brorand": {
-        "globals": {
-          "crypto": true,
-          "msCrypto": true
-        },
-        "packages": {
-          "browserify>browser-resolve": true
-        }
-      },
-      "ganache>secp256k1>elliptic>hmac-drbg": {
-        "packages": {
-          "ethereumjs-util>ethereum-cryptography>hash.js": true,
-          "ganache>secp256k1>elliptic>minimalistic-assert": true,
-          "ganache>secp256k1>elliptic>minimalistic-crypto-utils": true
-        }
-      },
-      "globalthis>define-properties": {
-        "packages": {
-          "globalthis>define-properties>has-property-descriptors": true,
-          "mocha>object.assign>object-keys": true
-        }
-      },
-      "globalthis>define-properties>has-property-descriptors": {
-        "packages": {
-          "string.prototype.matchall>get-intrinsic": true
-        }
-      },
-      "json-rpc-engine": {
-        "packages": {
-          "eth-rpc-errors": true,
-          "json-rpc-engine>@metamask/safe-event-emitter": true
-        }
-      },
-      "json-rpc-engine>@metamask/safe-event-emitter": {
-        "globals": {
-          "setTimeout": true
-        },
-        "packages": {
-          "browserify>events": true
-        }
-      },
-      "json-rpc-middleware-stream": {
-        "packages": {
-          "readable-stream": true
-        }
-      },
-      "jsonschema": {
-        "packages": {
-          "browserify>url": true
-        }
-      },
-      "koa>is-generator-function>has-tostringtag": {
-        "packages": {
-          "string.prototype.matchall>has-symbols": true
-        }
-      },
-      "lavamoat>json-stable-stringify": {
-        "packages": {
-          "lavamoat>json-stable-stringify>jsonify": true
-        }
-      },
-      "localforage": {
-        "globals": {
-          "Blob": true,
-          "BlobBuilder": true,
-          "FileReader": true,
-          "IDBKeyRange": true,
-          "MSBlobBuilder": true,
-          "MozBlobBuilder": true,
-          "OIndexedDB": true,
-          "WebKitBlobBuilder": true,
-          "atob": true,
-          "btoa": true,
-          "console.error": true,
-          "console.info": true,
-          "console.warn": true,
-          "define": true,
-          "fetch": true,
-          "indexedDB": true,
-          "localStorage": true,
-          "mozIndexedDB": true,
-          "msIndexedDB": true,
-          "navigator.platform": true,
-          "navigator.userAgent": true,
-          "openDatabase": true,
-          "setTimeout": true,
-          "webkitIndexedDB": true
-        }
-      },
-      "lodash": {
-        "globals": {
-          "clearTimeout": true,
-          "define": true,
-          "setTimeout": true
-        }
-      },
-      "loglevel": {
-        "globals": {
-          "console": true,
-          "define": true,
-          "document.cookie": true,
-          "localStorage": true,
-          "log": "write",
-          "navigator": true
-        }
-      },
-      "luxon": {
-        "globals": {
-          "Intl": true
-        }
-      },
-      "madge>ora>bl": {
-        "packages": {
-          "browserify>buffer": true,
-          "madge>ora>bl>readable-stream": true,
-          "pumpify>inherits": true
-        }
-      },
-      "madge>ora>bl>readable-stream": {
-        "packages": {
-          "@storybook/api>util-deprecate": true,
-          "browserify>browser-resolve": true,
-          "browserify>buffer": true,
-          "browserify>events": true,
-          "browserify>process": true,
-          "browserify>string_decoder": true,
-          "pumpify>inherits": true
-        }
-      },
-      "nanoid": {
-        "globals": {
-          "crypto": true,
-          "msCrypto": true,
-          "navigator": true
-        }
-      },
-      "nock>debug": {
-        "globals": {
-          "console": true,
-          "document": true,
-          "localStorage": true,
-          "navigator": true,
-          "process": true
-        },
-        "packages": {
-          "browserify>process": true,
-          "nock>debug>ms": true
-        }
-      },
-      "node-fetch": {
-        "globals": {
-          "Headers": true,
-          "Request": true,
-          "Response": true,
-          "fetch": true
-        }
-      },
-      "nonce-tracker": {
-        "packages": {
-          "await-semaphore": true,
-          "browserify>assert": true,
-          "ethjs-query": true
-        }
-      },
-      "obj-multiplex": {
-        "globals": {
-          "console.warn": true
-        },
-        "packages": {
-          "end-of-stream": true,
-          "pump>once": true,
-          "readable-stream": true
-        }
-      },
-      "promise-to-callback": {
-        "packages": {
-          "promise-to-callback>is-fn": true,
-          "promise-to-callback>set-immediate-shim": true
-        }
-      },
-      "promise-to-callback>set-immediate-shim": {
-        "globals": {
-          "setTimeout.apply": true
-        },
-        "packages": {
-          "browserify>timers-browserify": true
-        }
-      },
-      "prop-types": {
-        "globals": {
-          "console": true
-        },
-        "packages": {
-          "prop-types>react-is": true,
-          "react>object-assign": true
-        }
-      },
-      "prop-types>react-is": {
-        "globals": {
-          "console": true
-        }
-      },
-      "pubnub": {
-        "globals": {
-          "ActiveXObject": true,
-          "XMLHttpRequest": true,
-          "addEventListener": true,
-          "btoa": true,
-          "clearInterval": true,
-          "clearTimeout": true,
-          "console": true,
-          "define": true,
-          "localStorage.getItem": true,
-          "localStorage.setItem": true,
-          "location": true,
-          "navigator": true,
-          "setInterval": true,
-          "setTimeout": true
-        }
-      },
-      "pubnub>cbor-sync": {
-        "globals": {
-          "define": true
-        },
-        "packages": {
-          "browserify>buffer": true
-        }
-      },
-      "pump": {
-        "packages": {
-          "browserify>browser-resolve": true,
-          "browserify>process": true,
-          "end-of-stream": true,
-          "pump>once": true
-        }
-      },
-      "pump>once": {
-        "packages": {
-          "pump>once>wrappy": true
-        }
-      },
-      "qrcode-generator": {
-        "globals": {
-          "define": true
-        }
-      },
-      "qrcode.react": {
-        "globals": {
-          "Path2D": true,
-          "devicePixelRatio": true
-        },
-        "packages": {
-          "prop-types": true,
-          "qrcode.react>qr.js": true,
-          "react": true
-        }
-      },
-      "react": {
-        "globals": {
-          "console": true
-        },
-        "packages": {
-          "prop-types": true,
-          "react>object-assign": true
-        }
-      },
-      "react-devtools": {
-        "packages": {
-          "react-devtools>react-devtools-core": true
-        }
-      },
-      "react-devtools>react-devtools-core": {
-        "globals": {
-          "WebSocket": true,
-          "setTimeout": true
-        }
-      },
-      "react-dnd-html5-backend": {
-        "globals": {
-          "addEventListener": true,
-          "clearTimeout": true,
-          "removeEventListener": true
-        }
-      },
-      "react-dom": {
-        "globals": {
-          "HTMLIFrameElement": true,
-          "MSApp": true,
-          "__REACT_DEVTOOLS_GLOBAL_HOOK__": true,
-          "addEventListener": true,
-          "clearTimeout": true,
-          "clipboardData": true,
-          "console": true,
-          "dispatchEvent": true,
-          "document": true,
-          "event": "write",
-          "jest": true,
-          "location.protocol": true,
-          "navigator.userAgent.indexOf": true,
-          "performance": true,
-          "removeEventListener": true,
-          "self": true,
-          "setTimeout": true,
-          "top": true,
-          "trustedTypes": true
-        },
-        "packages": {
-          "prop-types": true,
-          "react": true,
-          "react-dom>scheduler": true,
-          "react>object-assign": true
-        }
-      },
-      "react-dom>scheduler": {
-        "globals": {
-          "MessageChannel": true,
-          "cancelAnimationFrame": true,
-          "clearTimeout": true,
-          "console": true,
-          "navigator": true,
-          "performance": true,
-          "requestAnimationFrame": true,
-          "setTimeout": true
-        }
-      },
-      "react-idle-timer": {
-        "globals": {
-          "clearTimeout": true,
-          "document": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "prop-types": true,
-          "react": true
-        }
-      },
-      "react-inspector": {
-        "globals": {
-          "Node.CDATA_SECTION_NODE": true,
-          "Node.COMMENT_NODE": true,
-          "Node.DOCUMENT_FRAGMENT_NODE": true,
-          "Node.DOCUMENT_NODE": true,
-          "Node.DOCUMENT_TYPE_NODE": true,
-          "Node.ELEMENT_NODE": true,
-          "Node.PROCESSING_INSTRUCTION_NODE": true,
-          "Node.TEXT_NODE": true
-        },
-        "packages": {
-          "ethjs-query>babel-runtime": true,
-          "prop-types": true,
-          "react": true,
-          "react-inspector>is-dom": true
-        }
-      },
-      "react-inspector>is-dom": {
-        "globals": {
-          "Node": true
-        },
-        "packages": {
-          "@lavamoat/snow>is-cross-origin>is-window": true,
-          "proxyquire>fill-keys>is-object": true
-        }
-      },
-      "react-markdown": {
-        "globals": {
-          "console.warn": true
-        },
-        "packages": {
-          "prop-types": true,
-          "react": true,
-          "react-markdown>comma-separated-tokens": true,
-          "react-markdown>property-information": true,
-          "react-markdown>react-is": true,
-          "react-markdown>remark-parse": true,
-          "react-markdown>remark-rehype": true,
-          "react-markdown>space-separated-tokens": true,
-          "react-markdown>style-to-object": true,
-          "react-markdown>unified": true,
-          "react-markdown>unist-util-visit": true,
-          "react-markdown>vfile": true
-        }
-      },
-      "react-markdown>property-information": {
-        "packages": {
-          "watchify>xtend": true
-        }
-      },
-      "react-markdown>react-is": {
-        "globals": {
-          "console": true
-        }
-      },
-      "react-markdown>remark-parse": {
-        "packages": {
-          "react-markdown>remark-parse>mdast-util-from-markdown": true
-        }
-      },
-      "react-markdown>remark-parse>mdast-util-from-markdown": {
-        "packages": {
-          "react-markdown>remark-parse>mdast-util-from-markdown>mdast-util-to-string": true,
-          "react-markdown>remark-parse>mdast-util-from-markdown>micromark": true,
-          "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities": true,
-          "react-markdown>vfile>unist-util-stringify-position": true
-        }
-      },
-      "react-markdown>remark-parse>mdast-util-from-markdown>micromark": {
-        "packages": {
-          "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities": true
-        }
-      },
-      "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities": {
-        "globals": {
-          "document.createElement": true
-        }
-      },
-      "react-markdown>remark-rehype": {
-        "packages": {
-          "react-markdown>remark-rehype>mdast-util-to-hast": true
-        }
-      },
-      "react-markdown>remark-rehype>mdast-util-to-hast": {
-        "globals": {
-          "console.warn": true
-        },
-        "packages": {
-          "react-markdown>remark-rehype>mdast-util-to-hast>mdast-util-definitions": true,
-          "react-markdown>remark-rehype>mdast-util-to-hast>mdurl": true,
-          "react-markdown>remark-rehype>mdast-util-to-hast>unist-builder": true,
-          "react-markdown>remark-rehype>mdast-util-to-hast>unist-util-generated": true,
-          "react-markdown>remark-rehype>mdast-util-to-hast>unist-util-position": true,
-          "react-markdown>unist-util-visit": true
-        }
-      },
-      "react-markdown>remark-rehype>mdast-util-to-hast>mdast-util-definitions": {
-        "packages": {
-          "react-markdown>unist-util-visit": true
-        }
-      },
-      "react-markdown>style-to-object": {
-        "packages": {
-          "react-markdown>style-to-object>inline-style-parser": true
-        }
-      },
-      "react-markdown>unified": {
-        "packages": {
-          "jsdom>request>extend": true,
-          "react-markdown>unified>bail": true,
-          "react-markdown>unified>is-buffer": true,
-          "react-markdown>unified>is-plain-obj": true,
-          "react-markdown>unified>trough": true,
-          "react-markdown>vfile": true
-        }
-      },
-      "react-markdown>unist-util-visit": {
-        "packages": {
-          "react-markdown>unist-util-visit>unist-util-visit-parents": true
-        }
-      },
-      "react-markdown>unist-util-visit>unist-util-visit-parents": {
-        "packages": {
-          "react-markdown>unist-util-visit>unist-util-is": true
-        }
-      },
-      "react-markdown>vfile": {
-        "packages": {
-          "browserify>path-browserify": true,
-          "browserify>process": true,
-          "react-markdown>vfile>is-buffer": true,
-          "react-markdown>vfile>vfile-message": true,
-          "vinyl>replace-ext": true
-        }
-      },
-      "react-markdown>vfile>vfile-message": {
-        "packages": {
-          "react-markdown>vfile>unist-util-stringify-position": true
-        }
-      },
-      "react-popper": {
-        "globals": {
-          "document": true
-        },
-        "packages": {
-          "@popperjs/core": true,
-          "react": true,
-          "react-popper>react-fast-compare": true,
-          "react-popper>warning": true
-        }
-      },
-      "react-popper>react-fast-compare": {
-        "globals": {
-          "Element": true,
-          "console.warn": true
-        }
-      },
-      "react-popper>warning": {
-        "globals": {
-          "console": true
-        }
-      },
-      "react-redux": {
-        "globals": {
-          "console": true,
-          "document": true
-        },
-        "packages": {
-          "@babel/runtime": true,
-          "prop-types": true,
-          "prop-types>react-is": true,
-          "react": true,
-          "react-dom": true,
-          "react-redux>hoist-non-react-statics": true,
-          "redux": true
-        }
-      },
-      "react-redux>hoist-non-react-statics": {
-        "packages": {
-          "prop-types>react-is": true
-        }
-      },
-      "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
-        }
-      },
-      "react-router-dom": {
-        "packages": {
-          "prop-types": true,
-          "react": true,
-          "react-router-dom>history": true,
-          "react-router-dom>react-router": true,
-          "react-router-dom>tiny-invariant": true,
-          "react-router-dom>tiny-warning": true
-        }
-      },
-      "react-router-dom>history": {
-        "globals": {
-          "addEventListener": true,
-          "confirm": true,
-          "document": true,
-          "history": true,
-          "location": true,
-          "navigator.userAgent": true,
-          "removeEventListener": true
-        },
-        "packages": {
-          "react-router-dom>history>resolve-pathname": true,
-          "react-router-dom>history>value-equal": true,
-          "react-router-dom>tiny-invariant": true,
-          "react-router-dom>tiny-warning": true
-        }
-      },
-      "react-router-dom>react-router": {
-        "packages": {
-          "prop-types": true,
-          "prop-types>react-is": true,
-          "react": true,
-          "react-redux>hoist-non-react-statics": true,
-          "react-router-dom>react-router>history": true,
-          "react-router-dom>react-router>mini-create-react-context": true,
-          "react-router-dom>tiny-invariant": true,
-          "react-router-dom>tiny-warning": true,
-          "sinon>nise>path-to-regexp": true
-        }
-      },
-      "react-router-dom>react-router>history": {
-        "globals": {
-          "addEventListener": true,
-          "confirm": true,
-          "document": true,
-          "history": true,
-          "location": true,
-          "navigator.userAgent": true,
-          "removeEventListener": true
-        },
-        "packages": {
-          "react-router-dom>history>resolve-pathname": true,
-          "react-router-dom>history>value-equal": true,
-          "react-router-dom>tiny-invariant": true,
-          "react-router-dom>tiny-warning": true
-        }
-      },
-      "react-router-dom>react-router>mini-create-react-context": {
-        "packages": {
-          "@babel/runtime": true,
-          "prop-types": true,
-          "react": true,
-          "react-router-dom>react-router>mini-create-react-context>gud": true,
-          "react-router-dom>tiny-warning": true
-        }
-      },
-      "react-router-dom>tiny-warning": {
-        "globals": {
-          "console": true
-        }
-      },
-      "react-simple-file-input": {
-        "globals": {
-          "File": true,
-          "FileReader": true,
-          "console.warn": true
-        },
-        "packages": {
-          "prop-types": true,
-          "react": true
-        }
-      },
-      "react-tippy": {
-        "globals": {
-          "Element": true,
-          "MSStream": true,
-          "MutationObserver": true,
-          "addEventListener": true,
-          "clearTimeout": true,
-          "console.error": true,
-          "console.warn": true,
-          "define": true,
-          "document": true,
-          "getComputedStyle": true,
-          "innerHeight": true,
-          "innerWidth": true,
-          "navigator.maxTouchPoints": true,
-          "navigator.msMaxTouchPoints": true,
-          "navigator.userAgent": true,
-          "performance": true,
-          "requestAnimationFrame": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "react": true,
-          "react-dom": true,
-          "react-tippy>popper.js": true
-        }
-      },
-      "react-tippy>popper.js": {
-        "globals": {
-          "MSInputMethodContext": true,
-          "Node.DOCUMENT_POSITION_FOLLOWING": true,
-          "cancelAnimationFrame": true,
-          "console.warn": true,
-          "define": true,
-          "devicePixelRatio": true,
-          "document": true,
-          "getComputedStyle": true,
-          "innerHeight": true,
-          "innerWidth": true,
-          "navigator.userAgent": true,
-          "requestAnimationFrame": true,
-          "setTimeout": true
-        }
-      },
-      "react-toggle-button": {
-        "globals": {
-          "clearTimeout": true,
-          "console.warn": true,
-          "define": true,
-          "performance": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "react": true
-        }
-      },
-      "react-transition-group": {
-        "globals": {
-          "clearTimeout": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "prop-types": true,
-          "react": true,
-          "react-dom": true,
-          "react-transition-group>chain-function": true,
-          "react-transition-group>dom-helpers": true,
-          "react-transition-group>warning": true
-        }
-      },
-      "react-transition-group>dom-helpers": {
-        "globals": {
-          "document": true,
-          "setTimeout": true
-        },
-        "packages": {
-          "@babel/runtime": true
-        }
-      },
-      "react-transition-group>warning": {
-        "globals": {
-          "console": true
-        }
-      },
-      "readable-stream": {
-        "packages": {
-          "@storybook/api>util-deprecate": true,
-          "browserify>browser-resolve": true,
-          "browserify>events": true,
-          "browserify>process": true,
-          "browserify>timers-browserify": true,
-          "pumpify>inherits": true,
-          "readable-stream>core-util-is": true,
-          "readable-stream>isarray": true,
-          "readable-stream>process-nextick-args": true,
-          "readable-stream>safe-buffer": true,
-          "readable-stream>string_decoder": true
-        }
-      },
-      "readable-stream>core-util-is": {
-        "packages": {
-          "browserify>insert-module-globals>is-buffer": true
-        }
-      },
-      "readable-stream>process-nextick-args": {
-        "packages": {
-          "browserify>process": true
-        }
-      },
-      "readable-stream>safe-buffer": {
-        "packages": {
-          "browserify>buffer": true
-        }
-      },
-      "readable-stream>string_decoder": {
-        "packages": {
-          "readable-stream>safe-buffer": true
-        }
-      },
-      "redux": {
-        "globals": {
-          "console": true
-        },
-        "packages": {
-          "@babel/runtime": true
-        }
-      },
-      "safe-event-emitter": {
-        "globals": {
-          "setTimeout": true
-        },
-        "packages": {
-          "browserify>util": true,
-          "webpack>events": true
-        }
-      },
-      "semver": {
-        "globals": {
-          "console.error": true
-        },
-        "packages": {
-          "browserify>process": true,
-          "semver>lru-cache": true
-        }
-      },
-      "semver>lru-cache": {
-        "packages": {
-          "semver>lru-cache>yallist": true
-        }
-      },
-      "sinon>nise>path-to-regexp": {
-        "packages": {
-          "sinon>nise>path-to-regexp>isarray": true
-        }
-      },
-      "string.prototype.matchall>call-bind": {
-        "packages": {
-          "mocha>object.assign>function-bind": true,
-          "string.prototype.matchall>get-intrinsic": true
-        }
-      },
-      "string.prototype.matchall>get-intrinsic": {
-        "globals": {
-          "AggregateError": true,
-          "FinalizationRegistry": true,
-          "WeakRef": true
-        },
-        "packages": {
-          "enzyme>has": true,
-          "mocha>object.assign>function-bind": true,
-          "string.prototype.matchall>has-symbols": true
-        }
-      },
-      "string.prototype.matchall>regexp.prototype.flags": {
-        "packages": {
-          "enzyme>function.prototype.name>functions-have-names": true,
-          "globalthis>define-properties": true,
-          "string.prototype.matchall>call-bind": true
-        }
-      },
-      "terser>source-map-support>buffer-from": {
-        "packages": {
-          "browserify>buffer": true
-        }
-      },
-      "uuid": {
-        "globals": {
-          "crypto": true,
-          "msCrypto": true
-        }
-      },
-      "vinyl>clone": {
-        "packages": {
-          "browserify>buffer": true
-        }
-      },
-      "vinyl>replace-ext": {
-        "packages": {
-          "browserify>path-browserify": true
-        }
-      },
-      "web3": {
-        "globals": {
-          "XMLHttpRequest": true
-        }
-      },
-      "web3-stream-provider": {
-        "globals": {
-          "setTimeout": true
-        },
-        "packages": {
-          "browserify>util": true,
-          "readable-stream": true,
-          "web3-stream-provider>uuid": true
-        }
-      },
-      "web3-stream-provider>uuid": {
-        "globals": {
-          "crypto": true,
-          "msCrypto": true
-        }
-      },
-      "webextension-polyfill": {
-        "globals": {
-          "browser": true,
-          "chrome": true,
-          "console.error": true,
-          "console.warn": true,
-          "define": true
-        }
-      },
-      "webpack>events": {
-        "globals": {
-          "console": true
-        }
+  "resources": {
+    "@babel/runtime": {
+      "globals": {
+        "regeneratorRuntime": "write"
+      }
+    },
+    "@download/blockies": {
+      "globals": {
+        "document.createElement": true
+      }
+    },
+    "@ensdomains/content-hash": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "@ensdomains/content-hash>cids": true,
+        "@ensdomains/content-hash>js-base64": true,
+        "@ensdomains/content-hash>multicodec": true,
+        "@ensdomains/content-hash>multihashes": true,
+        "browserify>buffer": true
+      }
+    },
+    "@ensdomains/content-hash>cids": {
+      "packages": {
+        "@ensdomains/content-hash>cids>multibase": true,
+        "@ensdomains/content-hash>cids>multicodec": true,
+        "@ensdomains/content-hash>cids>multihashes": true,
+        "@ensdomains/content-hash>cids>uint8arrays": true
+      }
+    },
+    "@ensdomains/content-hash>cids>multibase": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@ensdomains/content-hash>cids>multibase>@multiformats/base-x": true
+      }
+    },
+    "@ensdomains/content-hash>cids>multicodec": {
+      "packages": {
+        "@ensdomains/content-hash>cids>multicodec>varint": true,
+        "@ensdomains/content-hash>cids>uint8arrays": true
+      }
+    },
+    "@ensdomains/content-hash>cids>multihashes": {
+      "packages": {
+        "@ensdomains/content-hash>cids>multibase": true,
+        "@ensdomains/content-hash>cids>uint8arrays": true,
+        "@ensdomains/content-hash>multihashes>varint": true
+      }
+    },
+    "@ensdomains/content-hash>cids>uint8arrays": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@ensdomains/content-hash>cids>multibase": true
+      }
+    },
+    "@ensdomains/content-hash>js-base64": {
+      "globals": {
+        "Base64": "write",
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "atob": true,
+        "btoa": true,
+        "define": true
+      },
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "@ensdomains/content-hash>multicodec": {
+      "packages": {
+        "@ensdomains/content-hash>multicodec>uint8arrays": true,
+        "@ensdomains/content-hash>multicodec>varint": true
+      }
+    },
+    "@ensdomains/content-hash>multicodec>uint8arrays": {
+      "packages": {
+        "@ensdomains/content-hash>multicodec>uint8arrays>multibase": true,
+        "@ensdomains/content-hash>multihashes>web-encoding": true
+      }
+    },
+    "@ensdomains/content-hash>multicodec>uint8arrays>multibase": {
+      "packages": {
+        "@ensdomains/content-hash>cids>multibase>@multiformats/base-x": true,
+        "@ensdomains/content-hash>multihashes>web-encoding": true
+      }
+    },
+    "@ensdomains/content-hash>multihashes": {
+      "packages": {
+        "@ensdomains/content-hash>multihashes>multibase": true,
+        "@ensdomains/content-hash>multihashes>varint": true,
+        "@ensdomains/content-hash>multihashes>web-encoding": true,
+        "browserify>buffer": true
+      }
+    },
+    "@ensdomains/content-hash>multihashes>multibase": {
+      "packages": {
+        "@ensdomains/content-hash>multihashes>web-encoding": true,
+        "browserify>buffer": true,
+        "ethereumjs-wallet>bs58check>bs58>base-x": true
+      }
+    },
+    "@ensdomains/content-hash>multihashes>web-encoding": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "browserify>util": true
+      }
+    },
+    "@ethereumjs/common": {
+      "packages": {
+        "@ethereumjs/common>crc-32": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "ethereumjs-util": true
+      }
+    },
+    "@ethereumjs/common>crc-32": {
+      "globals": {
+        "DO_NOT_EXPORT_CRC": true,
+        "define": true
+      }
+    },
+    "@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/common": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "ethereumjs-util": true
+      }
+    },
+    "@ethersproject/abi": {
+      "globals": {
+        "console.log": true
+      },
+      "packages": {
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/constants": true,
+        "@ethersproject/abi>@ethersproject/hash": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/bignumber": true
+      }
+    },
+    "@ethersproject/abi>@ethersproject/address": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/providers>@ethersproject/rlp": true
+      }
+    },
+    "@ethersproject/abi>@ethersproject/bytes": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/logger": true
+      }
+    },
+    "@ethersproject/abi>@ethersproject/constants": {
+      "packages": {
+        "@ethersproject/bignumber": true
+      }
+    },
+    "@ethersproject/abi>@ethersproject/hash": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/providers>@ethersproject/base64": true
+      }
+    },
+    "@ethersproject/abi>@ethersproject/keccak256": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/keccak256>js-sha3": true
+      }
+    },
+    "@ethersproject/abi>@ethersproject/keccak256>js-sha3": {
+      "globals": {
+        "define": true
+      },
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "@ethersproject/abi>@ethersproject/logger": {
+      "globals": {
+        "console": true
+      }
+    },
+    "@ethersproject/abi>@ethersproject/properties": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/logger": true
+      }
+    },
+    "@ethersproject/abi>@ethersproject/strings": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/constants": true,
+        "@ethersproject/abi>@ethersproject/logger": true
+      }
+    },
+    "@ethersproject/bignumber": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/bignumber>bn.js": true
+      }
+    },
+    "@ethersproject/bignumber>bn.js": {
+      "globals": {
+        "Buffer": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
+    "@ethersproject/contracts": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethersproject/abi": true,
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/hdnode>@ethersproject/abstract-signer": true,
+        "@ethersproject/hdnode>@ethersproject/transactions": true,
+        "@ethersproject/providers>@ethersproject/abstract-provider": true
+      }
+    },
+    "@ethersproject/hdnode": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/hdnode>@ethersproject/basex": true,
+        "@ethersproject/hdnode>@ethersproject/pbkdf2": true,
+        "@ethersproject/hdnode>@ethersproject/sha2": true,
+        "@ethersproject/hdnode>@ethersproject/signing-key": true,
+        "@ethersproject/hdnode>@ethersproject/transactions": true,
+        "@ethersproject/hdnode>@ethersproject/wordlists": true
+      }
+    },
+    "@ethersproject/hdnode>@ethersproject/abstract-signer": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true
+      }
+    },
+    "@ethersproject/hdnode>@ethersproject/basex": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/properties": true
+      }
+    },
+    "@ethersproject/hdnode>@ethersproject/pbkdf2": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/hdnode>@ethersproject/sha2": true
+      }
+    },
+    "@ethersproject/hdnode>@ethersproject/sha2": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "ethereumjs-util>ethereum-cryptography>hash.js": true
+      }
+    },
+    "@ethersproject/hdnode>@ethersproject/signing-key": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "ganache>secp256k1>elliptic": true
+      }
+    },
+    "@ethersproject/hdnode>@ethersproject/transactions": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/constants": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/hdnode>@ethersproject/signing-key": true,
+        "@ethersproject/providers>@ethersproject/rlp": true
+      }
+    },
+    "@ethersproject/hdnode>@ethersproject/wordlists": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/hash": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/abi>@ethersproject/strings": true
+      }
+    },
+    "@ethersproject/providers": {
+      "globals": {
+        "WebSocket": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.log": true,
+        "console.warn": true,
+        "setInterval": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/constants": true,
+        "@ethersproject/abi>@ethersproject/hash": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/hdnode>@ethersproject/abstract-signer": true,
+        "@ethersproject/hdnode>@ethersproject/basex": true,
+        "@ethersproject/hdnode>@ethersproject/sha2": true,
+        "@ethersproject/hdnode>@ethersproject/transactions": true,
+        "@ethersproject/providers>@ethersproject/abstract-provider": true,
+        "@ethersproject/providers>@ethersproject/base64": true,
+        "@ethersproject/providers>@ethersproject/networks": true,
+        "@ethersproject/providers>@ethersproject/random": true,
+        "@ethersproject/providers>@ethersproject/web": true,
+        "@ethersproject/providers>bech32": true
+      }
+    },
+    "@ethersproject/providers>@ethersproject/abstract-provider": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/bignumber": true
+      }
+    },
+    "@ethersproject/providers>@ethersproject/base64": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      },
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true
+      }
+    },
+    "@ethersproject/providers>@ethersproject/networks": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/logger": true
+      }
+    },
+    "@ethersproject/providers>@ethersproject/random": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/logger": true
+      }
+    },
+    "@ethersproject/providers>@ethersproject/rlp": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/logger": true
+      }
+    },
+    "@ethersproject/providers>@ethersproject/web": {
+      "globals": {
+        "clearTimeout": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/providers>@ethersproject/base64": true
+      }
+    },
+    "@formatjs/intl-relativetimeformat": {
+      "globals": {
+        "Intl": true
+      },
+      "packages": {
+        "@formatjs/intl-relativetimeformat>@formatjs/intl-utils": true
+      }
+    },
+    "@formatjs/intl-relativetimeformat>@formatjs/intl-utils": {
+      "globals": {
+        "Intl.getCanonicalLocales": true
+      }
+    },
+    "@keystonehq/bc-ur-registry-eth": {
+      "packages": {
+        "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true,
+        "@keystonehq/bc-ur-registry-eth>hdkey": true,
+        "browserify>buffer": true,
+        "eth-lattice-keyring>@ethereumjs/util": true,
+        "uuid": true
+      }
+    },
+    "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": {
+      "globals": {
+        "define": true
+      },
+      "packages": {
+        "@ngraveio/bc-ur": true,
+        "browserify>buffer": true,
+        "enzyme>cheerio>tslib": true,
+        "ethereumjs-wallet>bs58check": true
+      }
+    },
+    "@keystonehq/bc-ur-registry-eth>hdkey": {
+      "packages": {
+        "browserify>assert": true,
+        "browserify>crypto-browserify": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
+        "ethereumjs-wallet>bs58check": true,
+        "ethereumjs-wallet>safe-buffer": true
+      }
+    },
+    "@keystonehq/metamask-airgapped-keyring": {
+      "packages": {
+        "@ethereumjs/tx": true,
+        "@keystonehq/bc-ur-registry-eth": true,
+        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": true,
+        "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "ethereumjs-util>rlp": true,
+        "uuid": true
+      }
+    },
+    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": {
+      "packages": {
+        "@ethereumjs/tx": true,
+        "@keystonehq/bc-ur-registry-eth": true,
+        "@keystonehq/bc-ur-registry-eth>hdkey": true,
+        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": true,
+        "browserify>buffer": true,
+        "eth-lattice-keyring>@ethereumjs/util": true,
+        "uuid": true
+      }
+    },
+    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": {
+      "globals": {
+        "TextEncoder": true
+      }
+    },
+    "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store": {
+      "packages": {
+        "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2": true,
+        "browserify>stream-browserify": true,
+        "json-rpc-engine>@metamask/safe-event-emitter": true
+      }
+    },
+    "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2": {
+      "packages": {
+        "browserify>process": true,
+        "browserify>util": true,
+        "readable-stream": true,
+        "watchify>xtend": true
+      }
+    },
+    "@material-ui/core": {
+      "globals": {
+        "Image": true,
+        "_formatMuiErrorMessage": true,
+        "addEventListener": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.error": true,
+        "console.warn": true,
+        "document": true,
+        "getComputedStyle": true,
+        "getSelection": true,
+        "innerHeight": true,
+        "innerWidth": true,
+        "matchMedia": true,
+        "navigator": true,
+        "performance.now": true,
+        "removeEventListener": true,
+        "requestAnimationFrame": true,
+        "setInterval": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/styles": true,
+        "@material-ui/core>@material-ui/system": true,
+        "@material-ui/core>@material-ui/utils": true,
+        "@material-ui/core>clsx": true,
+        "@material-ui/core>popper.js": true,
+        "@material-ui/core>react-transition-group": true,
+        "prop-types": true,
+        "prop-types>react-is": true,
+        "react": true,
+        "react-dom": true,
+        "react-redux>hoist-non-react-statics": true
+      }
+    },
+    "@material-ui/core>@material-ui/styles": {
+      "globals": {
+        "console.error": true,
+        "console.warn": true,
+        "document.createComment": true,
+        "document.head": true
+      },
+      "packages": {
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/styles>jss": true,
+        "@material-ui/core>@material-ui/styles>jss-plugin-camel-case": true,
+        "@material-ui/core>@material-ui/styles>jss-plugin-default-unit": true,
+        "@material-ui/core>@material-ui/styles>jss-plugin-global": true,
+        "@material-ui/core>@material-ui/styles>jss-plugin-nested": true,
+        "@material-ui/core>@material-ui/styles>jss-plugin-props-sort": true,
+        "@material-ui/core>@material-ui/styles>jss-plugin-rule-value-function": true,
+        "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer": true,
+        "@material-ui/core>@material-ui/utils": true,
+        "@material-ui/core>clsx": true,
+        "prop-types": true,
+        "react": true,
+        "react-redux>hoist-non-react-statics": true
+      }
+    },
+    "@material-ui/core>@material-ui/styles>jss": {
+      "globals": {
+        "CSS": true,
+        "document.createElement": true,
+        "document.querySelector": true
+      },
+      "packages": {
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/styles>jss>is-in-browser": true,
+        "react-router-dom>tiny-warning": true
+      }
+    },
+    "@material-ui/core>@material-ui/styles>jss-plugin-camel-case": {
+      "packages": {
+        "@material-ui/core>@material-ui/styles>jss-plugin-camel-case>hyphenate-style-name": true
+      }
+    },
+    "@material-ui/core>@material-ui/styles>jss-plugin-default-unit": {
+      "globals": {
+        "CSS": true
+      },
+      "packages": {
+        "@material-ui/core>@material-ui/styles>jss": true
+      }
+    },
+    "@material-ui/core>@material-ui/styles>jss-plugin-global": {
+      "packages": {
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/styles>jss": true
+      }
+    },
+    "@material-ui/core>@material-ui/styles>jss-plugin-nested": {
+      "packages": {
+        "@babel/runtime": true,
+        "react-router-dom>tiny-warning": true
+      }
+    },
+    "@material-ui/core>@material-ui/styles>jss-plugin-rule-value-function": {
+      "packages": {
+        "@material-ui/core>@material-ui/styles>jss": true,
+        "react-router-dom>tiny-warning": true
+      }
+    },
+    "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer": {
+      "packages": {
+        "@material-ui/core>@material-ui/styles>jss": true,
+        "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer>css-vendor": true
+      }
+    },
+    "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer>css-vendor": {
+      "globals": {
+        "document.createElement": true,
+        "document.documentElement": true,
+        "getComputedStyle": true
+      },
+      "packages": {
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/styles>jss>is-in-browser": true
+      }
+    },
+    "@material-ui/core>@material-ui/styles>jss>is-in-browser": {
+      "globals": {
+        "document": true
+      }
+    },
+    "@material-ui/core>@material-ui/system": {
+      "globals": {
+        "console.error": true
+      },
+      "packages": {
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/utils": true,
+        "prop-types": true
+      }
+    },
+    "@material-ui/core>@material-ui/utils": {
+      "packages": {
+        "@babel/runtime": true,
+        "prop-types": true,
+        "prop-types>react-is": true
+      }
+    },
+    "@material-ui/core>popper.js": {
+      "globals": {
+        "MSInputMethodContext": true,
+        "Node.DOCUMENT_POSITION_FOLLOWING": true,
+        "cancelAnimationFrame": true,
+        "console.warn": true,
+        "define": true,
+        "devicePixelRatio": true,
+        "document": true,
+        "getComputedStyle": true,
+        "innerHeight": true,
+        "innerWidth": true,
+        "navigator": true,
+        "requestAnimationFrame": true,
+        "setTimeout": true
+      }
+    },
+    "@material-ui/core>react-transition-group": {
+      "globals": {
+        "Element": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@material-ui/core>react-transition-group>dom-helpers": true,
+        "prop-types": true,
+        "react": true,
+        "react-dom": true
+      }
+    },
+    "@material-ui/core>react-transition-group>dom-helpers": {
+      "packages": {
+        "@babel/runtime": true
+      }
+    },
+    "@metamask/address-book-controller": {
+      "packages": {
+        "@metamask/address-book-controller>@metamask/base-controller": true,
+        "@metamask/controller-utils": true
+      }
+    },
+    "@metamask/address-book-controller>@metamask/base-controller": {
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/announcement-controller": {
+      "packages": {
+        "@metamask/announcement-controller>@metamask/base-controller": true
+      }
+    },
+    "@metamask/announcement-controller>@metamask/base-controller": {
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/approval-controller": {
+      "packages": {
+        "@metamask/approval-controller>nanoid": true,
+        "@metamask/base-controller": true,
+        "eth-rpc-errors": true
+      }
+    },
+    "@metamask/approval-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
+    "@metamask/assets-controllers": {
+      "globals": {
+        "Headers": true,
+        "URL": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.info": true,
+        "console.log": true,
+        "setInterval": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethersproject/contracts": true,
+        "@ethersproject/providers": true,
+        "@metamask/assets-controllers>@metamask/abi-utils": true,
+        "@metamask/assets-controllers>@metamask/controller-utils": true,
+        "@metamask/assets-controllers>abort-controller": true,
+        "@metamask/assets-controllers>multiformats": true,
+        "@metamask/base-controller": true,
+        "@metamask/contract-metadata": true,
+        "@metamask/metamask-eth-abis": true,
+        "@metamask/utils": true,
+        "browserify>events": true,
+        "eth-json-rpc-filters>async-mutex": true,
+        "eth-query": true,
+        "eth-rpc-errors": true,
+        "ethereumjs-util": true,
+        "single-call-balance-checker-abi": true,
+        "uuid": true
+      }
+    },
+    "@metamask/assets-controllers>@metamask/abi-utils": {
+      "packages": {
+        "@metamask/utils": true,
+        "@metamask/utils>superstruct": true
+      }
+    },
+    "@metamask/assets-controllers>@metamask/controller-utils": {
+      "globals": {
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/controller-utils>isomorphic-fetch": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true,
+        "ethereumjs-util": true,
+        "ethjs>ethjs-unit": true
+      }
+    },
+    "@metamask/assets-controllers>abort-controller": {
+      "globals": {
+        "AbortController": true
+      }
+    },
+    "@metamask/assets-controllers>multiformats": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "console.warn": true
+      }
+    },
+    "@metamask/base-controller": {
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/controller-utils": {
+      "globals": {
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/controller-utils>isomorphic-fetch": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true,
+        "ethereumjs-util": true,
+        "ethjs>ethjs-unit": true
+      }
+    },
+    "@metamask/controller-utils>isomorphic-fetch": {
+      "globals": {
+        "fetch.bind": true
+      },
+      "packages": {
+        "@metamask/controller-utils>isomorphic-fetch>whatwg-fetch": true
+      }
+    },
+    "@metamask/controller-utils>isomorphic-fetch>whatwg-fetch": {
+      "globals": {
+        "Blob": true,
+        "FileReader": true,
+        "FormData": true,
+        "URLSearchParams.prototype.isPrototypeOf": true,
+        "XMLHttpRequest": true,
+        "define": true,
+        "setTimeout": true
+      }
+    },
+    "@metamask/controllers>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
+    "@metamask/controllers>web3": {
+      "globals": {
+        "XMLHttpRequest": true
+      }
+    },
+    "@metamask/controllers>web3-provider-engine>cross-fetch>node-fetch": {
+      "globals": {
+        "fetch": true
+      }
+    },
+    "@metamask/controllers>web3-provider-engine>eth-json-rpc-middleware>node-fetch": {
+      "globals": {
+        "fetch": true
+      }
+    },
+    "@metamask/eth-json-rpc-infura": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": true,
+        "@metamask/utils": true,
+        "eth-rpc-errors": true,
+        "json-rpc-engine": true,
+        "node-fetch": true
+      }
+    },
+    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": {
+      "globals": {
+        "URL": true,
+        "btoa": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util": true,
+        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>pify": true,
+        "browserify>browser-resolve": true,
+        "eth-rpc-errors": true,
+        "json-rpc-engine": true,
+        "json-rpc-engine>@metamask/safe-event-emitter": true,
+        "lavamoat>json-stable-stringify": true,
+        "vinyl>clone": true
+      }
+    },
+    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util": {
+      "packages": {
+        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util": true,
+        "ethereumjs-abi": true
+      }
+    },
+    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util": {
+      "packages": {
+        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethjs-util": true,
+        "bn.js": true,
+        "browserify>assert": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-util>ethereum-cryptography": true,
+        "ethereumjs-util>rlp": true,
+        "ethereumjs-wallet>safe-buffer": true,
+        "ganache>secp256k1>elliptic": true
+      }
+    },
+    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethjs-util": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethjs>ethjs-util>is-hex-prefixed": true,
+        "ethjs>ethjs-util>strip-hex-prefix": true
+      }
+    },
+    "@metamask/eth-keyring-controller": {
+      "packages": {
+        "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring": true,
+        "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring": true,
+        "@metamask/eth-keyring-controller>obs-store": true,
+        "@metamask/rpc-methods>@metamask/browser-passworder": true,
+        "browserify>events": true,
+        "eth-json-rpc-middleware>@metamask/eth-sig-util": true
+      }
+    },
+    "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring": {
+      "globals": {
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography": true,
+        "@metamask/scure-bip39": true,
+        "browserify>buffer": true,
+        "eth-json-rpc-middleware>@metamask/eth-sig-util": true,
+        "eth-lattice-keyring>@ethereumjs/util": true
+      }
+    },
+    "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography": {
+      "globals": {
+        "TextDecoder": true,
+        "crypto": true
+      },
+      "packages": {
+        "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography>@noble/hashes": true,
+        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@scure/bip32": true
+      }
+    },
+    "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
+    "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring": {
+      "packages": {
+        "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "eth-json-rpc-middleware>@metamask/eth-sig-util": true,
+        "eth-lattice-keyring>@ethereumjs/util": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
+    "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography": {
+      "globals": {
+        "TextDecoder": true,
+        "crypto": true
+      },
+      "packages": {
+        "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography>@noble/hashes": true
+      }
+    },
+    "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
+    "@metamask/eth-keyring-controller>obs-store": {
+      "packages": {
+        "safe-event-emitter": true,
+        "watchify>xtend": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring": {
+      "globals": {
+        "addEventListener": true,
+        "console.log": true,
+        "document.createElement": true,
+        "document.head.appendChild": true,
+        "fetch": true,
+        "removeEventListener": true
+      },
+      "packages": {
+        "@ethereumjs/tx": true,
+        "@metamask/eth-ledger-bridge-keyring>eth-sig-util": true,
+        "@metamask/eth-ledger-bridge-keyring>hdkey": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "ethereumjs-util": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>eth-sig-util": {
+      "packages": {
+        "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util": true,
+        "browserify>buffer": true,
+        "eth-sig-util>tweetnacl": true,
+        "eth-sig-util>tweetnacl-util": true,
+        "ethereumjs-abi": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util": {
+      "packages": {
+        "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util>ethjs-util": true,
+        "bn.js": true,
+        "browserify>assert": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-util>ethereum-cryptography": true,
+        "ethereumjs-util>rlp": true,
+        "ethereumjs-wallet>safe-buffer": true,
+        "ganache>secp256k1>elliptic": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util>ethjs-util": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethjs>ethjs-util>is-hex-prefixed": true,
+        "ethjs>ethjs-util>strip-hex-prefix": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>hdkey": {
+      "packages": {
+        "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": true,
+        "browserify>assert": true,
+        "browserify>crypto-browserify": true,
+        "eth-trezor-keyring>hdkey>coinstring": true,
+        "ethereumjs-wallet>safe-buffer": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": {
+      "packages": {
+        "bn.js": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "eth-trezor-keyring>hdkey>secp256k1>bip66": true,
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-wallet>safe-buffer": true,
+        "ganache>secp256k1>elliptic": true
+      }
+    },
+    "@metamask/eth-token-tracker": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "@babel/runtime": true,
+        "@metamask/eth-token-tracker>deep-equal": true,
+        "@metamask/eth-token-tracker>eth-block-tracker": true,
+        "@metamask/eth-token-tracker>ethjs": true,
+        "@metamask/eth-token-tracker>human-standard-token-abi": true,
+        "ethjs-contract": true,
+        "ethjs-query": true,
+        "safe-event-emitter": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal": {
+      "packages": {
+        "@metamask/eth-token-tracker>deep-equal>is-arguments": true,
+        "@metamask/eth-token-tracker>deep-equal>is-date-object": true,
+        "enzyme>is-regex": true,
+        "enzyme>object-is": true,
+        "mocha>object.assign>object-keys": true,
+        "string.prototype.matchall>regexp.prototype.flags": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal>is-arguments": {
+      "packages": {
+        "koa>is-generator-function>has-tostringtag": true,
+        "string.prototype.matchall>call-bind": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal>is-date-object": {
+      "packages": {
+        "koa>is-generator-function>has-tostringtag": true
+      }
+    },
+    "@metamask/eth-token-tracker>eth-block-tracker": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/eth-token-tracker>eth-block-tracker>pify": true,
+        "eth-query": true,
+        "safe-event-emitter": true
+      }
+    },
+    "@metamask/eth-token-tracker>ethjs": {
+      "globals": {
+        "clearInterval": true,
+        "setInterval": true
+      },
+      "packages": {
+        "@metamask/eth-token-tracker>ethjs>bn.js": true,
+        "@metamask/eth-token-tracker>ethjs>ethjs-abi": true,
+        "@metamask/eth-token-tracker>ethjs>ethjs-contract": true,
+        "@metamask/eth-token-tracker>ethjs>ethjs-query": true,
+        "browserify>buffer": true,
+        "ethjs>ethjs-filter": true,
+        "ethjs>ethjs-provider-http": true,
+        "ethjs>ethjs-unit": true,
+        "ethjs>ethjs-util": true,
+        "ethjs>js-sha3": true,
+        "ethjs>number-to-bn": true
+      }
+    },
+    "@metamask/eth-token-tracker>ethjs>ethjs-abi": {
+      "packages": {
+        "@metamask/eth-token-tracker>ethjs>bn.js": true,
+        "browserify>buffer": true,
+        "ethjs>js-sha3": true,
+        "ethjs>number-to-bn": true
+      }
+    },
+    "@metamask/eth-token-tracker>ethjs>ethjs-contract": {
+      "packages": {
+        "@metamask/eth-token-tracker>ethjs>ethjs-contract>ethjs-abi": true,
+        "ethjs-query>babel-runtime": true,
+        "ethjs>ethjs-filter": true,
+        "ethjs>ethjs-util": true,
+        "ethjs>js-sha3": true,
+        "promise-to-callback": true
+      }
+    },
+    "@metamask/eth-token-tracker>ethjs>ethjs-contract>ethjs-abi": {
+      "packages": {
+        "@metamask/eth-token-tracker>ethjs>bn.js": true,
+        "browserify>buffer": true,
+        "ethjs>js-sha3": true,
+        "ethjs>number-to-bn": true
+      }
+    },
+    "@metamask/eth-token-tracker>ethjs>ethjs-query": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "ethjs-query>babel-runtime": true,
+        "ethjs-query>ethjs-format": true,
+        "ethjs-query>ethjs-rpc": true,
+        "promise-to-callback": true
+      }
+    },
+    "@metamask/etherscan-link": {
+      "globals": {
+        "URL": true
+      }
+    },
+    "@metamask/gas-fee-controller": {
+      "globals": {
+        "clearInterval": true,
+        "console.error": true,
+        "setInterval": true
+      },
+      "packages": {
+        "@metamask/controller-utils": true,
+        "@metamask/gas-fee-controller>@metamask/base-controller": true,
+        "eth-query": true,
+        "ethereumjs-util": true,
+        "ethjs>ethjs-unit": true,
+        "uuid": true
+      }
+    },
+    "@metamask/gas-fee-controller>@metamask/base-controller": {
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/jazzicon": {
+      "globals": {
+        "document.createElement": true,
+        "document.createElementNS": true
+      },
+      "packages": {
+        "@metamask/jazzicon>color": true,
+        "@metamask/jazzicon>mersenne-twister": true
+      }
+    },
+    "@metamask/jazzicon>color": {
+      "packages": {
+        "@metamask/jazzicon>color>clone": true,
+        "@metamask/jazzicon>color>color-convert": true,
+        "@metamask/jazzicon>color>color-string": true
+      }
+    },
+    "@metamask/jazzicon>color>clone": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "@metamask/jazzicon>color>color-convert": {
+      "packages": {
+        "@metamask/jazzicon>color>color-convert>color-name": true
+      }
+    },
+    "@metamask/jazzicon>color>color-string": {
+      "packages": {
+        "jest-canvas-mock>moo-color>color-name": true
+      }
+    },
+    "@metamask/key-tree": {
+      "packages": {
+        "@metamask/key-tree>@noble/ed25519": true,
+        "@metamask/key-tree>@noble/hashes": true,
+        "@metamask/key-tree>@noble/secp256k1": true,
+        "@metamask/key-tree>@scure/base": true,
+        "@metamask/scure-bip39": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/key-tree>@noble/ed25519": {
+      "globals": {
+        "crypto": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
+    "@metamask/key-tree>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
+    "@metamask/key-tree>@noble/secp256k1": {
+      "globals": {
+        "crypto": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
+    "@metamask/key-tree>@scure/base": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      }
+    },
+    "@metamask/logo": {
+      "globals": {
+        "addEventListener": true,
+        "document.body.appendChild": true,
+        "document.createElementNS": true,
+        "innerHeight": true,
+        "innerWidth": true,
+        "requestAnimationFrame": true
+      },
+      "packages": {
+        "@metamask/logo>gl-mat4": true,
+        "@metamask/logo>gl-vec3": true
+      }
+    },
+    "@metamask/notification-controller": {
+      "packages": {
+        "@metamask/controller-utils": true,
+        "@metamask/notification-controller>@metamask/base-controller": true,
+        "@metamask/notification-controller>nanoid": true
+      }
+    },
+    "@metamask/notification-controller>@metamask/base-controller": {
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/notification-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
+    "@metamask/obs-store": {
+      "globals": {
+        "localStorage": true
+      },
+      "packages": {
+        "@metamask/obs-store>through2": true,
+        "browserify>stream-browserify": true,
+        "json-rpc-engine>@metamask/safe-event-emitter": true
+      }
+    },
+    "@metamask/obs-store>through2": {
+      "packages": {
+        "browserify>process": true,
+        "browserify>util": true,
+        "readable-stream": true,
+        "watchify>xtend": true
+      }
+    },
+    "@metamask/permission-controller": {
+      "packages": {
+        "@metamask/base-controller": true,
+        "@metamask/controller-utils": true,
+        "@metamask/permission-controller>nanoid": true,
+        "deep-freeze-strict": true,
+        "eth-rpc-errors": true,
+        "immer": true,
+        "json-rpc-engine": true
+      }
+    },
+    "@metamask/permission-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
+    "@metamask/phishing-controller": {
+      "globals": {
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/base-controller": true,
+        "@metamask/controller-utils>isomorphic-fetch": true,
+        "@metamask/phishing-controller>@metamask/controller-utils": true,
+        "@metamask/phishing-warning>eth-phishing-detect": true,
+        "punycode": true
+      }
+    },
+    "@metamask/phishing-controller>@metamask/controller-utils": {
+      "globals": {
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/controller-utils>isomorphic-fetch": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true,
+        "ethereumjs-util": true,
+        "ethjs>ethjs-unit": true
+      }
+    },
+    "@metamask/phishing-warning>eth-phishing-detect": {
+      "packages": {
+        "eslint>optionator>fast-levenshtein": true
+      }
+    },
+    "@metamask/post-message-stream": {
+      "globals": {
+        "WorkerGlobalScope": true,
+        "addEventListener": true,
+        "browser": true,
+        "chrome": true,
+        "location.origin": true,
+        "onmessage": "write",
+        "postMessage": true,
+        "removeEventListener": true
+      },
+      "packages": {
+        "@metamask/post-message-stream>readable-stream": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/post-message-stream>readable-stream": {
+      "packages": {
+        "@metamask/post-message-stream>readable-stream>process-nextick-args": true,
+        "@metamask/post-message-stream>readable-stream>safe-buffer": true,
+        "@metamask/post-message-stream>readable-stream>string_decoder": true,
+        "@storybook/api>util-deprecate": true,
+        "browserify>browser-resolve": true,
+        "browserify>events": true,
+        "browserify>process": true,
+        "browserify>timers-browserify": true,
+        "pumpify>inherits": true,
+        "readable-stream>core-util-is": true,
+        "readable-stream>isarray": true
+      }
+    },
+    "@metamask/post-message-stream>readable-stream>process-nextick-args": {
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "@metamask/post-message-stream>readable-stream>safe-buffer": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "@metamask/post-message-stream>readable-stream>string_decoder": {
+      "packages": {
+        "@metamask/post-message-stream>readable-stream>safe-buffer": true
+      }
+    },
+    "@metamask/providers>@metamask/object-multiplex": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "end-of-stream": true,
+        "pump>once": true,
+        "readable-stream": true
+      }
+    },
+    "@metamask/rate-limit-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/rate-limit-controller>@metamask/base-controller": true,
+        "eth-rpc-errors": true
+      }
+    },
+    "@metamask/rate-limit-controller>@metamask/base-controller": {
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/rpc-methods": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "@metamask/key-tree": true,
+        "@metamask/key-tree>@noble/hashes": true,
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-methods>@metamask/browser-passworder": true,
+        "@metamask/rpc-methods>nanoid": true,
+        "@metamask/snaps-ui": true,
+        "@metamask/snaps-utils": true,
+        "@metamask/utils": true,
+        "@metamask/utils>superstruct": true,
+        "eth-rpc-errors": true
+      }
+    },
+    "@metamask/rpc-methods>@metamask/browser-passworder": {
+      "globals": {
+        "btoa": true,
+        "crypto.getRandomValues": true,
+        "crypto.subtle.decrypt": true,
+        "crypto.subtle.deriveKey": true,
+        "crypto.subtle.encrypt": true,
+        "crypto.subtle.exportKey": true,
+        "crypto.subtle.importKey": true
+      },
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "@metamask/rpc-methods>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
+    "@metamask/scure-bip39": {
+      "globals": {
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/key-tree>@noble/hashes": true,
+        "@metamask/key-tree>@scure/base": true
+      }
+    },
+    "@metamask/smart-transactions-controller": {
+      "globals": {
+        "URLSearchParams": true,
+        "clearInterval": true,
+        "console.error": true,
+        "console.log": true,
+        "fetch": true,
+        "setInterval": true
+      },
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/providers": true,
+        "@metamask/base-controller": true,
+        "@metamask/controller-utils": true,
+        "@metamask/controller-utils>isomorphic-fetch": true,
+        "@metamask/smart-transactions-controller>bignumber.js": true,
+        "fast-json-patch": true,
+        "lodash": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
+    "@metamask/smart-transactions-controller>bignumber.js": {
+      "globals": {
+        "crypto": true,
+        "define": true
+      }
+    },
+    "@metamask/snaps-controllers": {
+      "globals": {
+        "URL": true,
+        "chrome.offscreen.createDocument": true,
+        "chrome.offscreen.hasDocument": true,
+        "clearTimeout": true,
+        "console.error": true,
+        "console.info": true,
+        "console.log": true,
+        "console.warn": true,
+        "document.getElementById": true,
+        "fetch.bind": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/base-controller": true,
+        "@metamask/permission-controller": true,
+        "@metamask/post-message-stream": true,
+        "@metamask/providers>@metamask/object-multiplex": true,
+        "@metamask/rpc-methods": true,
+        "@metamask/snaps-controllers>@xstate/fsm": true,
+        "@metamask/snaps-controllers>concat-stream": true,
+        "@metamask/snaps-controllers>gunzip-maybe": true,
+        "@metamask/snaps-controllers>nanoid": true,
+        "@metamask/snaps-controllers>readable-web-to-node-stream": true,
+        "@metamask/snaps-controllers>tar-stream": true,
+        "@metamask/snaps-utils": true,
+        "@metamask/subject-metadata-controller": true,
+        "@metamask/utils": true,
+        "eth-rpc-errors": true,
+        "json-rpc-engine": true,
+        "json-rpc-middleware-stream": true,
+        "pump": true
+      }
+    },
+    "@metamask/snaps-controllers>concat-stream": {
+      "packages": {
+        "@metamask/snaps-controllers>concat-stream>readable-stream": true,
+        "browserify>buffer": true,
+        "pumpify>inherits": true
+      }
+    },
+    "@metamask/snaps-controllers>concat-stream>readable-stream": {
+      "packages": {
+        "@storybook/api>util-deprecate": true,
+        "browserify>browser-resolve": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "browserify>process": true,
+        "browserify>string_decoder": true,
+        "pumpify>inherits": true
+      }
+    },
+    "@metamask/snaps-controllers>gunzip-maybe": {
+      "packages": {
+        "@metamask/snaps-controllers>gunzip-maybe>browserify-zlib": true,
+        "@metamask/snaps-controllers>gunzip-maybe>is-deflate": true,
+        "@metamask/snaps-controllers>gunzip-maybe>is-gzip": true,
+        "@metamask/snaps-controllers>gunzip-maybe>peek-stream": true,
+        "@metamask/snaps-controllers>gunzip-maybe>pumpify": true,
+        "@metamask/snaps-controllers>gunzip-maybe>through2": true
+      }
+    },
+    "@metamask/snaps-controllers>gunzip-maybe>browserify-zlib": {
+      "packages": {
+        "@metamask/snaps-controllers>gunzip-maybe>browserify-zlib>pako": true,
+        "browserify>assert": true,
+        "browserify>buffer": true,
+        "browserify>process": true,
+        "browserify>util": true,
+        "readable-stream": true
+      }
+    },
+    "@metamask/snaps-controllers>gunzip-maybe>peek-stream": {
+      "packages": {
+        "@metamask/snaps-controllers>gunzip-maybe>peek-stream>duplexify": true,
+        "@metamask/snaps-controllers>gunzip-maybe>peek-stream>through2": true,
+        "browserify>buffer": true,
+        "terser>source-map-support>buffer-from": true
+      }
+    },
+    "@metamask/snaps-controllers>gunzip-maybe>peek-stream>duplexify": {
+      "packages": {
+        "browserify>buffer": true,
+        "browserify>process": true,
+        "duplexify>stream-shift": true,
+        "end-of-stream": true,
+        "pumpify>inherits": true,
+        "readable-stream": true
+      }
+    },
+    "@metamask/snaps-controllers>gunzip-maybe>peek-stream>through2": {
+      "packages": {
+        "browserify>process": true,
+        "browserify>util": true,
+        "readable-stream": true,
+        "watchify>xtend": true
+      }
+    },
+    "@metamask/snaps-controllers>gunzip-maybe>pumpify": {
+      "packages": {
+        "@metamask/snaps-controllers>gunzip-maybe>pumpify>duplexify": true,
+        "@metamask/snaps-controllers>gunzip-maybe>pumpify>pump": true,
+        "pumpify>inherits": true
+      }
+    },
+    "@metamask/snaps-controllers>gunzip-maybe>pumpify>duplexify": {
+      "packages": {
+        "browserify>buffer": true,
+        "browserify>process": true,
+        "duplexify>stream-shift": true,
+        "end-of-stream": true,
+        "pumpify>inherits": true,
+        "readable-stream": true
+      }
+    },
+    "@metamask/snaps-controllers>gunzip-maybe>pumpify>pump": {
+      "packages": {
+        "browserify>browser-resolve": true,
+        "end-of-stream": true,
+        "pump>once": true
+      }
+    },
+    "@metamask/snaps-controllers>gunzip-maybe>through2": {
+      "packages": {
+        "browserify>process": true,
+        "browserify>util": true,
+        "readable-stream": true,
+        "watchify>xtend": true
+      }
+    },
+    "@metamask/snaps-controllers>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
+    "@metamask/snaps-controllers>readable-web-to-node-stream": {
+      "packages": {
+        "@metamask/snaps-controllers>readable-web-to-node-stream>readable-stream": true
+      }
+    },
+    "@metamask/snaps-controllers>readable-web-to-node-stream>readable-stream": {
+      "packages": {
+        "@storybook/api>util-deprecate": true,
+        "browserify>browser-resolve": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "browserify>process": true,
+        "browserify>string_decoder": true,
+        "pumpify>inherits": true
+      }
+    },
+    "@metamask/snaps-controllers>tar-stream": {
+      "packages": {
+        "@metamask/snaps-controllers>tar-stream>fs-constants": true,
+        "@metamask/snaps-controllers>tar-stream>readable-stream": true,
+        "browserify>buffer": true,
+        "browserify>process": true,
+        "browserify>string_decoder": true,
+        "browserify>util": true,
+        "end-of-stream": true,
+        "madge>ora>bl": true,
+        "pumpify>inherits": true
+      }
+    },
+    "@metamask/snaps-controllers>tar-stream>fs-constants": {
+      "packages": {
+        "browserify>constants-browserify": true
+      }
+    },
+    "@metamask/snaps-controllers>tar-stream>readable-stream": {
+      "packages": {
+        "@storybook/api>util-deprecate": true,
+        "browserify>browser-resolve": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "browserify>process": true,
+        "browserify>string_decoder": true,
+        "pumpify>inherits": true
+      }
+    },
+    "@metamask/snaps-ui": {
+      "packages": {
+        "@metamask/utils": true,
+        "@metamask/utils>superstruct": true
+      }
+    },
+    "@metamask/snaps-utils": {
+      "globals": {
+        "TextDecoder": true,
+        "URL": true,
+        "document.body.appendChild": true,
+        "document.createElement": true
+      },
+      "packages": {
+        "@metamask/key-tree>@noble/hashes": true,
+        "@metamask/key-tree>@scure/base": true,
+        "@metamask/snaps-utils>cron-parser": true,
+        "@metamask/snaps-utils>rfdc": true,
+        "@metamask/snaps-utils>validate-npm-package-name": true,
+        "@metamask/utils": true,
+        "@metamask/utils>superstruct": true,
+        "semver": true
+      }
+    },
+    "@metamask/snaps-utils>cron-parser": {
+      "packages": {
+        "browserify>browser-resolve": true,
+        "luxon": true
+      }
+    },
+    "@metamask/snaps-utils>rfdc": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "@metamask/snaps-utils>validate-npm-package-name": {
+      "packages": {
+        "@metamask/snaps-utils>validate-npm-package-name>builtins": true
+      }
+    },
+    "@metamask/snaps-utils>validate-npm-package-name>builtins": {
+      "packages": {
+        "browserify>process": true,
+        "semver": true
+      }
+    },
+    "@metamask/subject-metadata-controller": {
+      "packages": {
+        "@metamask/base-controller": true
+      }
+    },
+    "@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
+    "@ngraveio/bc-ur": {
+      "packages": {
+        "@ngraveio/bc-ur>@apocentre/alias-sampling": true,
+        "@ngraveio/bc-ur>bignumber.js": true,
+        "@ngraveio/bc-ur>crc": true,
+        "@ngraveio/bc-ur>jsbi": true,
+        "addons-linter>sha.js": true,
+        "browserify>assert": true,
+        "browserify>buffer": true,
+        "pubnub>cbor-sync": true
+      }
+    },
+    "@ngraveio/bc-ur>bignumber.js": {
+      "globals": {
+        "crypto": true,
+        "define": true
+      }
+    },
+    "@ngraveio/bc-ur>crc": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "@ngraveio/bc-ur>jsbi": {
+      "globals": {
+        "define": true
+      }
+    },
+    "@popperjs/core": {
+      "globals": {
+        "Element": true,
+        "HTMLElement": true,
+        "ShadowRoot": true,
+        "console.error": true,
+        "console.warn": true,
+        "document": true,
+        "navigator.userAgent": true
+      }
+    },
+    "@reduxjs/toolkit": {
+      "globals": {
+        "AbortController": true,
+        "__REDUX_DEVTOOLS_EXTENSION_COMPOSE__": true,
+        "__REDUX_DEVTOOLS_EXTENSION__": true,
+        "console.error": true,
+        "console.info": true,
+        "console.warn": true
+      },
+      "packages": {
+        "@reduxjs/toolkit>reselect": true,
+        "immer": true,
+        "redux": true,
+        "redux-thunk": true
+      }
+    },
+    "@segment/loosely-validate-event": {
+      "packages": {
+        "@segment/loosely-validate-event>component-type": true,
+        "@segment/loosely-validate-event>join-component": true,
+        "browserify>assert": true,
+        "browserify>buffer": true
+      }
+    },
+    "@sentry/browser": {
+      "globals": {
+        "XMLHttpRequest": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@sentry/browser>@sentry/core": true,
+        "@sentry/browser>tslib": true,
+        "@sentry/types": true,
+        "@sentry/utils": true
+      }
+    },
+    "@sentry/browser>@sentry/core": {
+      "globals": {
+        "clearInterval": true,
+        "setInterval": true
+      },
+      "packages": {
+        "@sentry/browser>@sentry/core>@sentry/hub": true,
+        "@sentry/browser>@sentry/core>@sentry/minimal": true,
+        "@sentry/browser>@sentry/core>tslib": true,
+        "@sentry/types": true,
+        "@sentry/utils": true
+      }
+    },
+    "@sentry/browser>@sentry/core>@sentry/hub": {
+      "globals": {
+        "clearInterval": true,
+        "setInterval": true
+      },
+      "packages": {
+        "@sentry/browser>@sentry/core>@sentry/hub>tslib": true,
+        "@sentry/types": true,
+        "@sentry/utils": true
+      }
+    },
+    "@sentry/browser>@sentry/core>@sentry/hub>tslib": {
+      "globals": {
+        "define": true
+      }
+    },
+    "@sentry/browser>@sentry/core>@sentry/minimal": {
+      "packages": {
+        "@sentry/browser>@sentry/core>@sentry/hub": true,
+        "@sentry/browser>@sentry/core>@sentry/minimal>tslib": true
+      }
+    },
+    "@sentry/browser>@sentry/core>@sentry/minimal>tslib": {
+      "globals": {
+        "define": true
+      }
+    },
+    "@sentry/browser>@sentry/core>tslib": {
+      "globals": {
+        "define": true
+      }
+    },
+    "@sentry/browser>tslib": {
+      "globals": {
+        "define": true
+      }
+    },
+    "@sentry/integrations": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "console.log": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@sentry/integrations>tslib": true,
+        "@sentry/types": true,
+        "@sentry/utils": true,
+        "localforage": true
+      }
+    },
+    "@sentry/integrations>tslib": {
+      "globals": {
+        "define": true
+      }
+    },
+    "@sentry/utils": {
+      "globals": {
+        "CustomEvent": true,
+        "DOMError": true,
+        "DOMException": true,
+        "Element": true,
+        "ErrorEvent": true,
+        "Event": true,
+        "Headers": true,
+        "Request": true,
+        "Response": true,
+        "XMLHttpRequest.prototype": true,
+        "clearTimeout": true,
+        "console.error": true,
+        "document": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@sentry/utils>tslib": true,
+        "browserify>process": true
+      }
+    },
+    "@sentry/utils>tslib": {
+      "globals": {
+        "define": true
+      }
+    },
+    "@spruceid/siwe-parser": {
+      "globals": {
+        "console.error": true,
+        "console.log": true
+      },
+      "packages": {
+        "@spruceid/siwe-parser>apg-js": true
+      }
+    },
+    "@spruceid/siwe-parser>apg-js": {
+      "globals": {
+        "mode": true
+      },
+      "packages": {
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true
+      }
+    },
+    "@storybook/api>regenerator-runtime": {
+      "globals": {
+        "regeneratorRuntime": "write"
+      }
+    },
+    "@storybook/api>util-deprecate": {
+      "globals": {
+        "console.trace": true,
+        "console.warn": true,
+        "localStorage": true
+      }
+    },
+    "@truffle/codec": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils": true,
+        "@truffle/codec>@truffle/compile-common": true,
+        "@truffle/codec>big.js": true,
+        "@truffle/codec>bn.js": true,
+        "@truffle/codec>cbor": true,
+        "@truffle/codec>semver": true,
+        "@truffle/codec>utf8": true,
+        "@truffle/codec>web3-utils": true,
+        "browserify>buffer": true,
+        "browserify>os-browserify": true,
+        "browserify>util": true,
+        "lodash": true,
+        "nock>debug": true
+      }
+    },
+    "@truffle/codec>@truffle/abi-utils": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>change-case": true,
+        "@truffle/codec>@truffle/abi-utils>fast-check": true,
+        "@truffle/codec>web3-utils": true
+      }
+    },
+    "@truffle/codec>@truffle/abi-utils>change-case": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>change-case>camel-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>constant-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>dot-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>header-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>is-lower-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>is-upper-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>lower-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>lower-case-first": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>no-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>param-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>pascal-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>path-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>sentence-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>snake-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>swap-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>title-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>upper-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>upper-case-first": true
+      }
+    },
+    "@truffle/codec>@truffle/abi-utils>change-case>camel-case": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>change-case>no-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>upper-case": true
+      }
+    },
+    "@truffle/codec>@truffle/abi-utils>change-case>constant-case": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>change-case>snake-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>upper-case": true
+      }
+    },
+    "@truffle/codec>@truffle/abi-utils>change-case>dot-case": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>change-case>no-case": true
+      }
+    },
+    "@truffle/codec>@truffle/abi-utils>change-case>header-case": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>change-case>no-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>upper-case": true
+      }
+    },
+    "@truffle/codec>@truffle/abi-utils>change-case>is-lower-case": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>change-case>lower-case": true
+      }
+    },
+    "@truffle/codec>@truffle/abi-utils>change-case>is-upper-case": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>change-case>upper-case": true
+      }
+    },
+    "@truffle/codec>@truffle/abi-utils>change-case>lower-case-first": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>change-case>lower-case": true
+      }
+    },
+    "@truffle/codec>@truffle/abi-utils>change-case>no-case": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>change-case>lower-case": true
+      }
+    },
+    "@truffle/codec>@truffle/abi-utils>change-case>param-case": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>change-case>no-case": true
+      }
+    },
+    "@truffle/codec>@truffle/abi-utils>change-case>pascal-case": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>change-case>pascal-case>camel-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>upper-case-first": true
+      }
+    },
+    "@truffle/codec>@truffle/abi-utils>change-case>pascal-case>camel-case": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>change-case>no-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>upper-case": true
+      }
+    },
+    "@truffle/codec>@truffle/abi-utils>change-case>path-case": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>change-case>no-case": true
+      }
+    },
+    "@truffle/codec>@truffle/abi-utils>change-case>sentence-case": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>change-case>no-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>upper-case-first": true
+      }
+    },
+    "@truffle/codec>@truffle/abi-utils>change-case>snake-case": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>change-case>no-case": true
+      }
+    },
+    "@truffle/codec>@truffle/abi-utils>change-case>swap-case": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>change-case>lower-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>upper-case": true
+      }
+    },
+    "@truffle/codec>@truffle/abi-utils>change-case>title-case": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>change-case>no-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>upper-case": true
+      }
+    },
+    "@truffle/codec>@truffle/abi-utils>change-case>upper-case-first": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>change-case>upper-case": true
+      }
+    },
+    "@truffle/codec>@truffle/abi-utils>fast-check": {
+      "globals": {
+        "clearTimeout": true,
+        "console.log": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>fast-check>pure-rand": true,
+        "browserify>buffer": true
+      }
+    },
+    "@truffle/codec>@truffle/compile-common": {
+      "packages": {
+        "@truffle/codec>@truffle/compile-common>@truffle/error": true,
+        "@truffle/codec>@truffle/compile-common>colors": true,
+        "browserify>path-browserify": true
+      }
+    },
+    "@truffle/codec>@truffle/compile-common>colors": {
+      "globals": {
+        "console.log": true
+      },
+      "packages": {
+        "browserify>os-browserify": true,
+        "browserify>process": true,
+        "browserify>util": true
+      }
+    },
+    "@truffle/codec>big.js": {
+      "globals": {
+        "define": true
+      }
+    },
+    "@truffle/codec>bn.js": {
+      "globals": {
+        "Buffer": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
+    "@truffle/codec>cbor": {
+      "globals": {
+        "TextDecoder": true
+      },
+      "packages": {
+        "@truffle/codec>cbor>bignumber.js": true,
+        "@truffle/codec>cbor>nofilter": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "browserify>stream-browserify": true,
+        "browserify>url": true,
+        "browserify>util": true
+      }
+    },
+    "@truffle/codec>cbor>bignumber.js": {
+      "globals": {
+        "crypto": true,
+        "define": true
+      }
+    },
+    "@truffle/codec>cbor>nofilter": {
+      "packages": {
+        "browserify>buffer": true,
+        "browserify>stream-browserify": true,
+        "browserify>util": true
+      }
+    },
+    "@truffle/codec>semver": {
+      "globals": {
+        "console.error": true
+      },
+      "packages": {
+        "@truffle/codec>semver>lru-cache": true,
+        "browserify>process": true
+      }
+    },
+    "@truffle/codec>semver>lru-cache": {
+      "packages": {
+        "semver>lru-cache>yallist": true
+      }
+    },
+    "@truffle/codec>web3-utils": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "@truffle/codec>utf8": true,
+        "@truffle/codec>web3-utils>bn.js": true,
+        "@truffle/codec>web3-utils>ethereum-bloom-filters": true,
+        "browserify>buffer": true,
+        "ethereumjs-util": true,
+        "ethereumjs-wallet>randombytes": true,
+        "ethjs>ethjs-unit": true,
+        "ethjs>number-to-bn": true
+      }
+    },
+    "@truffle/codec>web3-utils>bn.js": {
+      "globals": {
+        "Buffer": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
+    "@truffle/codec>web3-utils>ethereum-bloom-filters": {
+      "packages": {
+        "@truffle/codec>web3-utils>ethereum-bloom-filters>js-sha3": true
+      }
+    },
+    "@truffle/codec>web3-utils>ethereum-bloom-filters>js-sha3": {
+      "globals": {
+        "define": true
+      },
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "@truffle/decoder": {
+      "packages": {
+        "@truffle/codec": true,
+        "@truffle/codec>@truffle/abi-utils": true,
+        "@truffle/codec>@truffle/compile-common": true,
+        "@truffle/codec>web3-utils": true,
+        "@truffle/decoder>@truffle/encoder": true,
+        "@truffle/decoder>@truffle/source-map-utils": true,
+        "@truffle/decoder>bn.js": true,
+        "nock>debug": true
+      }
+    },
+    "@truffle/decoder>@truffle/encoder": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/bignumber": true,
+        "@truffle/codec": true,
+        "@truffle/codec>@truffle/abi-utils": true,
+        "@truffle/codec>@truffle/compile-common": true,
+        "@truffle/codec>web3-utils": true,
+        "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs": true,
+        "@truffle/decoder>@truffle/encoder>big.js": true,
+        "@truffle/decoder>@truffle/encoder>bignumber.js": true,
+        "lodash": true,
+        "nock>debug": true
+      }
+    },
+    "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs": {
+      "globals": {
+        "console.log": true,
+        "console.warn": true,
+        "registries": true
+      },
+      "packages": {
+        "@babel/runtime": true,
+        "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>@ensdomains/address-encoder": true,
+        "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>@ensdomains/ens": true,
+        "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>@ensdomains/resolver": true,
+        "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash": true,
+        "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers": true,
+        "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>js-sha3": true,
+        "browserify>buffer": true,
+        "eth-ens-namehash": true,
+        "ethereumjs-wallet>bs58check>bs58": true
+      }
+    },
+    "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>@ensdomains/address-encoder": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true,
+        "browserify>crypto-browserify": true,
+        "ethereumjs-util>create-hash>ripemd160": true
+      }
+    },
+    "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash": {
+      "packages": {
+        "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>cids": true,
+        "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>multicodec": true,
+        "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>multihashes": true,
+        "browserify>buffer": true
+      }
+    },
+    "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>cids": {
+      "packages": {
+        "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>cids>class-is": true,
+        "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>cids>multibase": true,
+        "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>cids>multicodec": true,
+        "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>multihashes": true,
+        "browserify>buffer": true
+      }
+    },
+    "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>cids>multibase": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-wallet>bs58check>bs58>base-x": true
+      }
+    },
+    "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>cids>multicodec": {
+      "packages": {
+        "@ensdomains/content-hash>multihashes>varint": true,
+        "browserify>buffer": true
+      }
+    },
+    "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>multicodec": {
+      "packages": {
+        "@ensdomains/content-hash>multihashes>varint": true,
+        "browserify>buffer": true
+      }
+    },
+    "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>multihashes": {
+      "packages": {
+        "@ensdomains/content-hash>multihashes>varint": true,
+        "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>multihashes>multibase": true,
+        "browserify>buffer": true
+      }
+    },
+    "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>content-hash>multihashes>multibase": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-wallet>bs58check>bs58>base-x": true
+      }
+    },
+    "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers": {
+      "packages": {
+        "@ethersproject/abi": true,
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/constants": true,
+        "@ethersproject/abi>@ethersproject/hash": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/hdnode": true,
+        "@ethersproject/hdnode>@ethersproject/abstract-signer": true,
+        "@ethersproject/hdnode>@ethersproject/basex": true,
+        "@ethersproject/hdnode>@ethersproject/sha2": true,
+        "@ethersproject/hdnode>@ethersproject/signing-key": true,
+        "@ethersproject/hdnode>@ethersproject/transactions": true,
+        "@ethersproject/hdnode>@ethersproject/wordlists": true,
+        "@ethersproject/providers": true,
+        "@ethersproject/providers>@ethersproject/base64": true,
+        "@ethersproject/providers>@ethersproject/random": true,
+        "@ethersproject/providers>@ethersproject/rlp": true,
+        "@ethersproject/providers>@ethersproject/web": true,
+        "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers>@ethersproject/json-wallets": true,
+        "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers>@ethersproject/solidity": true,
+        "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers>@ethersproject/units": true,
+        "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers>@ethersproject/wallet": true
+      }
+    },
+    "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers>@ethersproject/json-wallets": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/hdnode": true,
+        "@ethersproject/hdnode>@ethersproject/pbkdf2": true,
+        "@ethersproject/hdnode>@ethersproject/transactions": true,
+        "@ethersproject/providers>@ethersproject/random": true,
+        "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers>@ethersproject/json-wallets>aes-js": true,
+        "ethereumjs-util>ethereum-cryptography>scrypt-js": true
+      }
+    },
+    "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers>@ethersproject/json-wallets>aes-js": {
+      "globals": {
+        "define": true
+      }
+    },
+    "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers>@ethersproject/solidity": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/hdnode>@ethersproject/sha2": true
+      }
+    },
+    "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers>@ethersproject/units": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/bignumber": true
+      }
+    },
+    "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers>@ethersproject/wallet": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/hash": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/hdnode": true,
+        "@ethersproject/hdnode>@ethersproject/abstract-signer": true,
+        "@ethersproject/hdnode>@ethersproject/signing-key": true,
+        "@ethersproject/hdnode>@ethersproject/transactions": true,
+        "@ethersproject/providers>@ethersproject/abstract-provider": true,
+        "@ethersproject/providers>@ethersproject/random": true,
+        "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>ethers>@ethersproject/json-wallets": true
+      }
+    },
+    "@truffle/decoder>@truffle/encoder>@ensdomains/ensjs>js-sha3": {
+      "globals": {
+        "define": true
+      },
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "@truffle/decoder>@truffle/encoder>big.js": {
+      "globals": {
+        "define": true
+      }
+    },
+    "@truffle/decoder>@truffle/encoder>bignumber.js": {
+      "globals": {
+        "crypto": true,
+        "define": true
+      }
+    },
+    "@truffle/decoder>@truffle/source-map-utils": {
+      "packages": {
+        "@truffle/codec": true,
+        "@truffle/codec>web3-utils": true,
+        "@truffle/decoder>@truffle/source-map-utils>@truffle/code-utils": true,
+        "@truffle/decoder>@truffle/source-map-utils>json-pointer": true,
+        "@truffle/decoder>@truffle/source-map-utils>node-interval-tree": true,
+        "nock>debug": true
+      }
+    },
+    "@truffle/decoder>@truffle/source-map-utils>@truffle/code-utils": {
+      "packages": {
+        "@truffle/codec>cbor": true,
+        "browserify>buffer": true
+      }
+    },
+    "@truffle/decoder>@truffle/source-map-utils>json-pointer": {
+      "packages": {
+        "@truffle/decoder>@truffle/source-map-utils>json-pointer>foreach": true
+      }
+    },
+    "@truffle/decoder>@truffle/source-map-utils>node-interval-tree": {
+      "packages": {
+        "@storybook/addon-a11y>react-sizeme>shallowequal": true
+      }
+    },
+    "@truffle/decoder>bn.js": {
+      "globals": {
+        "Buffer": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
+    "@zxing/browser": {
+      "globals": {
+        "HTMLElement": true,
+        "HTMLImageElement": true,
+        "HTMLVideoElement": true,
+        "URL.createObjectURL": true,
+        "clearTimeout": true,
+        "console.error": true,
+        "console.warn": true,
+        "document": true,
+        "navigator": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@zxing/library": true
+      }
+    },
+    "@zxing/library": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "btoa": true,
+        "clearTimeout": true,
+        "define": true,
+        "document.createElement": true,
+        "document.createElementNS": true,
+        "document.getElementById": true,
+        "navigator.mediaDevices.enumerateDevices": true,
+        "navigator.mediaDevices.getUserMedia": true,
+        "setTimeout": true
+      }
+    },
+    "addons-linter>sha.js": {
+      "packages": {
+        "ethereumjs-wallet>safe-buffer": true,
+        "pumpify>inherits": true
+      }
+    },
+    "await-semaphore": {
+      "packages": {
+        "browserify>process": true,
+        "browserify>timers-browserify": true
+      }
+    },
+    "base32-encode": {
+      "packages": {
+        "base32-encode>to-data-view": true
+      }
+    },
+    "bignumber.js": {
+      "globals": {
+        "crypto": true,
+        "define": true
+      }
+    },
+    "bn.js": {
+      "globals": {
+        "Buffer": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
+    "bowser": {
+      "globals": {
+        "define": true
+      }
+    },
+    "browserify>assert": {
+      "globals": {
+        "Buffer": true
+      },
+      "packages": {
+        "browserify>assert>util": true,
+        "react>object-assign": true
+      }
+    },
+    "browserify>assert>util": {
+      "globals": {
+        "console.error": true,
+        "console.log": true,
+        "console.trace": true,
+        "process": true
+      },
+      "packages": {
+        "browserify>assert>util>inherits": true,
+        "browserify>process": true
+      }
+    },
+    "browserify>browser-resolve": {
+      "packages": {
+        "ethjs-query>babel-runtime>core-js": true
+      }
+    },
+    "browserify>buffer": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "base64-js": true,
+        "browserify>buffer>ieee754": true
+      }
+    },
+    "browserify>crypto-browserify": {
+      "packages": {
+        "browserify>crypto-browserify>browserify-cipher": true,
+        "browserify>crypto-browserify>browserify-sign": true,
+        "browserify>crypto-browserify>create-ecdh": true,
+        "browserify>crypto-browserify>create-hmac": true,
+        "browserify>crypto-browserify>diffie-hellman": true,
+        "browserify>crypto-browserify>pbkdf2": true,
+        "browserify>crypto-browserify>public-encrypt": true,
+        "browserify>crypto-browserify>randomfill": true,
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
+    "browserify>crypto-browserify>browserify-cipher": {
+      "packages": {
+        "browserify>crypto-browserify>browserify-cipher>browserify-des": true,
+        "browserify>crypto-browserify>browserify-cipher>evp_bytestokey": true,
+        "ethereumjs-util>ethereum-cryptography>browserify-aes": true
+      }
+    },
+    "browserify>crypto-browserify>browserify-cipher>browserify-des": {
+      "packages": {
+        "browserify>buffer": true,
+        "browserify>crypto-browserify>browserify-cipher>browserify-des>des.js": true,
+        "ethereumjs-util>create-hash>cipher-base": true,
+        "pumpify>inherits": true
+      }
+    },
+    "browserify>crypto-browserify>browserify-cipher>browserify-des>des.js": {
+      "packages": {
+        "ganache>secp256k1>elliptic>minimalistic-assert": true,
+        "pumpify>inherits": true
+      }
+    },
+    "browserify>crypto-browserify>browserify-cipher>evp_bytestokey": {
+      "packages": {
+        "ethereumjs-util>create-hash>md5.js": true,
+        "ethereumjs-wallet>safe-buffer": true
+      }
+    },
+    "browserify>crypto-browserify>browserify-sign": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true,
+        "browserify>crypto-browserify>create-hmac": true,
+        "browserify>crypto-browserify>public-encrypt>browserify-rsa": true,
+        "browserify>crypto-browserify>public-encrypt>parse-asn1": true,
+        "browserify>stream-browserify": true,
+        "ethereumjs-util>create-hash": true,
+        "ganache>secp256k1>elliptic": true,
+        "pumpify>inherits": true
+      }
+    },
+    "browserify>crypto-browserify>create-ecdh": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true,
+        "ganache>secp256k1>elliptic": true
+      }
+    },
+    "browserify>crypto-browserify>create-hmac": {
+      "packages": {
+        "addons-linter>sha.js": true,
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-util>create-hash>cipher-base": true,
+        "ethereumjs-util>create-hash>ripemd160": true,
+        "ethereumjs-wallet>safe-buffer": true,
+        "pumpify>inherits": true
+      }
+    },
+    "browserify>crypto-browserify>diffie-hellman": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true,
+        "browserify>crypto-browserify>diffie-hellman>miller-rabin": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
+    "browserify>crypto-browserify>diffie-hellman>miller-rabin": {
+      "packages": {
+        "bn.js": true,
+        "ganache>secp256k1>elliptic>brorand": true
+      }
+    },
+    "browserify>crypto-browserify>pbkdf2": {
+      "globals": {
+        "crypto": true,
+        "process": true,
+        "queueMicrotask": true,
+        "setImmediate": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "addons-linter>sha.js": true,
+        "browserify>process": true,
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-util>create-hash>ripemd160": true,
+        "ethereumjs-wallet>safe-buffer": true
+      }
+    },
+    "browserify>crypto-browserify>public-encrypt": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true,
+        "browserify>crypto-browserify>public-encrypt>browserify-rsa": true,
+        "browserify>crypto-browserify>public-encrypt>parse-asn1": true,
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
+    "browserify>crypto-browserify>public-encrypt>browserify-rsa": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
+    "browserify>crypto-browserify>public-encrypt>parse-asn1": {
+      "packages": {
+        "browserify>buffer": true,
+        "browserify>crypto-browserify>browserify-cipher>evp_bytestokey": true,
+        "browserify>crypto-browserify>pbkdf2": true,
+        "browserify>crypto-browserify>public-encrypt>parse-asn1>asn1.js": true,
+        "ethereumjs-util>ethereum-cryptography>browserify-aes": true
+      }
+    },
+    "browserify>crypto-browserify>public-encrypt>parse-asn1>asn1.js": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true,
+        "browserify>vm-browserify": true,
+        "ganache>secp256k1>elliptic>minimalistic-assert": true,
+        "pumpify>inherits": true
+      }
+    },
+    "browserify>crypto-browserify>randomfill": {
+      "globals": {
+        "crypto": true,
+        "msCrypto": true
+      },
+      "packages": {
+        "browserify>process": true,
+        "ethereumjs-wallet>randombytes": true,
+        "ethereumjs-wallet>safe-buffer": true
+      }
+    },
+    "browserify>events": {
+      "globals": {
+        "console": true
+      }
+    },
+    "browserify>os-browserify": {
+      "globals": {
+        "location": true,
+        "navigator": true
+      }
+    },
+    "browserify>path-browserify": {
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "browserify>process": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      }
+    },
+    "browserify>punycode": {
+      "globals": {
+        "define": true
+      }
+    },
+    "browserify>stream-browserify": {
+      "packages": {
+        "browserify>events": true,
+        "pumpify>inherits": true,
+        "readable-stream": true
+      }
+    },
+    "browserify>string_decoder": {
+      "packages": {
+        "ethereumjs-wallet>safe-buffer": true
+      }
+    },
+    "browserify>timers-browserify": {
+      "globals": {
+        "clearInterval": true,
+        "clearTimeout": true,
+        "setInterval": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "browserify>url": {
+      "packages": {
+        "browserify>punycode": true,
+        "browserify>querystring-es3": true
+      }
+    },
+    "browserify>util": {
+      "globals": {
+        "console.error": true,
+        "console.log": true,
+        "console.trace": true,
+        "process": true
+      },
+      "packages": {
+        "browserify>process": true,
+        "browserify>util>inherits": true
+      }
+    },
+    "browserify>vm-browserify": {
+      "globals": {
+        "document.body.appendChild": true,
+        "document.body.removeChild": true,
+        "document.createElement": true
+      }
+    },
+    "classnames": {
+      "globals": {
+        "classNames": "write",
+        "define": true
+      }
+    },
+    "copy-to-clipboard": {
+      "globals": {
+        "clipboardData": true,
+        "console.error": true,
+        "console.warn": true,
+        "document.body.appendChild": true,
+        "document.body.removeChild": true,
+        "document.createElement": true,
+        "document.createRange": true,
+        "document.execCommand": true,
+        "document.getSelection": true,
+        "navigator.userAgent": true,
+        "prompt": true
+      },
+      "packages": {
+        "copy-to-clipboard>toggle-selection": true
+      }
+    },
+    "copy-to-clipboard>toggle-selection": {
+      "globals": {
+        "document.activeElement": true,
+        "document.getSelection": true
+      }
+    },
+    "currency-formatter": {
+      "packages": {
+        "currency-formatter>accounting": true,
+        "currency-formatter>locale-currency": true,
+        "react>object-assign": true
+      }
+    },
+    "currency-formatter>accounting": {
+      "globals": {
+        "define": true
+      }
+    },
+    "currency-formatter>locale-currency": {
+      "globals": {
+        "countryCode": true
+      }
+    },
+    "debounce-stream": {
+      "packages": {
+        "debounce-stream>debounce": true,
+        "debounce-stream>duplexer": true,
+        "debounce-stream>through": true
+      }
+    },
+    "debounce-stream>debounce": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      }
+    },
+    "debounce-stream>duplexer": {
+      "packages": {
+        "browserify>stream-browserify": true
+      }
+    },
+    "debounce-stream>through": {
+      "packages": {
+        "browserify>process": true,
+        "browserify>stream-browserify": true
+      }
+    },
+    "depcheck>@vue/compiler-sfc>postcss>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
+    "dependency-tree>precinct>detective-postcss>postcss>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
+    "end-of-stream": {
+      "packages": {
+        "browserify>process": true,
+        "pump>once": true
+      }
+    },
+    "enzyme>cheerio>tslib": {
+      "globals": {
+        "define": true
+      }
+    },
+    "enzyme>has": {
+      "packages": {
+        "mocha>object.assign>function-bind": true
+      }
+    },
+    "enzyme>is-regex": {
+      "packages": {
+        "koa>is-generator-function>has-tostringtag": true,
+        "string.prototype.matchall>call-bind": true
+      }
+    },
+    "enzyme>object-is": {
+      "packages": {
+        "globalthis>define-properties": true,
+        "string.prototype.matchall>call-bind": true
+      }
+    },
+    "eslint>optionator>fast-levenshtein": {
+      "globals": {
+        "Intl": true,
+        "Levenshtein": "write",
+        "console.log": true,
+        "define": true,
+        "importScripts": true,
+        "postMessage": true
+      }
+    },
+    "eth-block-tracker": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/utils": true,
+        "eth-block-tracker>pify": true,
+        "eth-query>json-rpc-random-id": true,
+        "json-rpc-engine>@metamask/safe-event-emitter": true
+      }
+    },
+    "eth-ens-namehash": {
+      "globals": {
+        "name": "write"
+      },
+      "packages": {
+        "browserify>buffer": true,
+        "eth-ens-namehash>idna-uts46-hx": true,
+        "eth-ens-namehash>js-sha3": true
+      }
+    },
+    "eth-ens-namehash>idna-uts46-hx": {
+      "globals": {
+        "define": true
+      },
+      "packages": {
+        "browserify>punycode": true
+      }
+    },
+    "eth-ens-namehash>js-sha3": {
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "eth-json-rpc-filters": {
+      "globals": {
+        "console.error": true
+      },
+      "packages": {
+        "eth-json-rpc-filters>async-mutex": true,
+        "eth-query": true,
+        "json-rpc-engine": true,
+        "json-rpc-engine>@metamask/safe-event-emitter": true,
+        "pify": true
+      }
+    },
+    "eth-json-rpc-filters>async-mutex": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "enzyme>cheerio>tslib": true
+      }
+    },
+    "eth-json-rpc-middleware": {
+      "globals": {
+        "URL": true,
+        "btoa": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/utils": true,
+        "browserify>browser-resolve": true,
+        "eth-json-rpc-middleware>@metamask/eth-sig-util": true,
+        "eth-json-rpc-middleware>pify": true,
+        "eth-rpc-errors": true,
+        "json-rpc-engine": true,
+        "json-rpc-engine>@metamask/safe-event-emitter": true,
+        "lavamoat>json-stable-stringify": true,
+        "vinyl>clone": true
+      }
+    },
+    "eth-json-rpc-middleware>@metamask/eth-sig-util": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography": true,
+        "eth-json-rpc-middleware>@metamask/eth-sig-util>ethjs-util": true,
+        "eth-lattice-keyring>@ethereumjs/util": true,
+        "eth-sig-util>tweetnacl": true,
+        "eth-sig-util>tweetnacl-util": true
+      }
+    },
+    "eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography": {
+      "globals": {
+        "TextDecoder": true,
+        "crypto": true
+      },
+      "packages": {
+        "eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography>@noble/hashes": true
+      }
+    },
+    "eth-json-rpc-middleware>@metamask/eth-sig-util>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
+    "eth-json-rpc-middleware>@metamask/eth-sig-util>ethjs-util": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethjs>ethjs-util>is-hex-prefixed": true,
+        "ethjs>ethjs-util>strip-hex-prefix": true
+      }
+    },
+    "eth-keyring-controller>@metamask/browser-passworder": {
+      "globals": {
+        "crypto": true
+      }
+    },
+    "eth-lattice-keyring": {
+      "globals": {
+        "addEventListener": true,
+        "browser": true,
+        "clearInterval": true,
+        "fetch": true,
+        "open": true,
+        "setInterval": true
+      },
+      "packages": {
+        "browserify>buffer": true,
+        "browserify>crypto-browserify": true,
+        "browserify>events": true,
+        "eth-lattice-keyring>@ethereumjs/tx": true,
+        "eth-lattice-keyring>@ethereumjs/util": true,
+        "eth-lattice-keyring>bn.js": true,
+        "eth-lattice-keyring>gridplus-sdk": true,
+        "eth-lattice-keyring>rlp": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/common": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "ethereumjs-util": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "eth-lattice-keyring>@ethereumjs/util>@ethereumjs/rlp": true,
+        "eth-lattice-keyring>@ethereumjs/util>async": true,
+        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/util>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/util>async": {
+      "globals": {
+        "clearTimeout": true,
+        "console": true,
+        "define": true,
+        "queueMicrotask": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>process": true,
+        "browserify>timers-browserify": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography": {
+      "globals": {
+        "TextDecoder": true,
+        "crypto": true
+      },
+      "packages": {
+        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/hashes": true,
+        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": {
+      "globals": {
+        "crypto": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@scure/bip32": {
+      "packages": {
+        "@metamask/key-tree>@noble/hashes": true,
+        "@metamask/key-tree>@scure/base": true,
+        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": true
+      }
+    },
+    "eth-lattice-keyring>bn.js": {
+      "globals": {
+        "Buffer": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk": {
+      "globals": {
+        "AbortController": true,
+        "Request": true,
+        "__values": true,
+        "caches": true,
+        "clearTimeout": true,
+        "console.error": true,
+        "console.log": true,
+        "console.warn": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/common>crc-32": true,
+        "@ethersproject/abi": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "browserify>process": true,
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true,
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": true,
+        "eth-lattice-keyring>gridplus-sdk>bech32": true,
+        "eth-lattice-keyring>gridplus-sdk>bignumber.js": true,
+        "eth-lattice-keyring>gridplus-sdk>bitwise": true,
+        "eth-lattice-keyring>gridplus-sdk>borc": true,
+        "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true,
+        "eth-lattice-keyring>gridplus-sdk>js-sha3": true,
+        "eth-lattice-keyring>gridplus-sdk>rlp": true,
+        "eth-lattice-keyring>gridplus-sdk>secp256k1": true,
+        "eth-lattice-keyring>gridplus-sdk>uuid": true,
+        "ethereumjs-util>ethereum-cryptography>hash.js": true,
+        "ethereumjs-wallet>aes-js": true,
+        "ethereumjs-wallet>bs58check": true,
+        "ganache>secp256k1>elliptic": true,
+        "lodash": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": {
+      "packages": {
+        "@ethereumjs/common>crc-32": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "ethereumjs-util": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": {
+      "packages": {
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": true,
+        "ethereumjs-util": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": {
+      "packages": {
+        "@ethereumjs/common>crc-32": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "ethereumjs-util": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>bignumber.js": {
+      "globals": {
+        "crypto": true,
+        "define": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>bitwise": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>borc": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "browserify>buffer": true,
+        "browserify>buffer>ieee754": true,
+        "eth-lattice-keyring>gridplus-sdk>borc>bignumber.js": true,
+        "eth-lattice-keyring>gridplus-sdk>borc>iso-url": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>borc>bignumber.js": {
+      "globals": {
+        "crypto": true,
+        "define": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>borc>iso-url": {
+      "globals": {
+        "URL": true,
+        "URLSearchParams": true,
+        "location": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": {
+      "globals": {
+        "intToBuffer": true
+      },
+      "packages": {
+        "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>bn.js": true,
+        "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>buffer": true,
+        "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>js-sha3": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>bn.js": {
+      "globals": {
+        "Buffer": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>buffer": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "base64-js": true,
+        "browserify>buffer>ieee754": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>js-sha3": {
+      "globals": {
+        "define": true
+      },
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>js-sha3": {
+      "globals": {
+        "define": true
+      },
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>rlp": {
+      "globals": {
+        "TextEncoder": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>secp256k1": {
+      "packages": {
+        "ganache>secp256k1>elliptic": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
+    "eth-lattice-keyring>rlp": {
+      "globals": {
+        "TextEncoder": true
+      }
+    },
+    "eth-method-registry": {
+      "packages": {
+        "ethjs": true
+      }
+    },
+    "eth-query": {
+      "packages": {
+        "eth-query>json-rpc-random-id": true,
+        "nock>debug": true,
+        "watchify>xtend": true
+      }
+    },
+    "eth-rpc-errors": {
+      "packages": {
+        "eth-rpc-errors>fast-safe-stringify": true
+      }
+    },
+    "eth-sig-util": {
+      "packages": {
+        "browserify>buffer": true,
+        "eth-sig-util>ethereumjs-util": true,
+        "eth-sig-util>tweetnacl": true,
+        "eth-sig-util>tweetnacl-util": true,
+        "ethereumjs-abi": true
+      }
+    },
+    "eth-sig-util>ethereumjs-util": {
+      "packages": {
+        "bn.js": true,
+        "browserify>assert": true,
+        "browserify>buffer": true,
+        "eth-sig-util>ethereumjs-util>ethjs-util": true,
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-util>ethereum-cryptography": true,
+        "ethereumjs-util>rlp": true,
+        "ethereumjs-wallet>safe-buffer": true,
+        "ganache>secp256k1>elliptic": true
+      }
+    },
+    "eth-sig-util>ethereumjs-util>ethjs-util": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethjs>ethjs-util>is-hex-prefixed": true,
+        "ethjs>ethjs-util>strip-hex-prefix": true
+      }
+    },
+    "eth-sig-util>tweetnacl": {
+      "globals": {
+        "crypto": true,
+        "msCrypto": true,
+        "nacl": "write"
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
+    "eth-sig-util>tweetnacl-util": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
+    "eth-trezor-keyring": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "eth-trezor-keyring>hdkey": true,
+        "eth-trezor-keyring>trezor-connect": true,
+        "ethereumjs-util": true
+      }
+    },
+    "eth-trezor-keyring>hdkey": {
+      "packages": {
+        "browserify>assert": true,
+        "browserify>crypto-browserify": true,
+        "eth-trezor-keyring>hdkey>coinstring": true,
+        "eth-trezor-keyring>hdkey>secp256k1": true,
+        "ethereumjs-wallet>safe-buffer": true
+      }
+    },
+    "eth-trezor-keyring>hdkey>coinstring": {
+      "packages": {
+        "browserify>buffer": true,
+        "eth-trezor-keyring>hdkey>coinstring>bs58": true,
+        "ethereumjs-util>create-hash": true
+      }
+    },
+    "eth-trezor-keyring>hdkey>secp256k1": {
+      "packages": {
+        "bn.js": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "eth-trezor-keyring>hdkey>secp256k1>bip66": true,
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-wallet>safe-buffer": true,
+        "ganache>secp256k1>elliptic": true
+      }
+    },
+    "eth-trezor-keyring>hdkey>secp256k1>bip66": {
+      "packages": {
+        "ethereumjs-wallet>safe-buffer": true
+      }
+    },
+    "eth-trezor-keyring>trezor-connect": {
+      "globals": {
+        "__TREZOR_CONNECT_SRC": true,
+        "addEventListener": true,
+        "btoa": true,
+        "chrome": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console": true,
+        "document.body": true,
+        "document.createElement": true,
+        "document.createTextNode": true,
+        "document.getElementById": true,
+        "document.querySelectorAll": true,
+        "location": true,
+        "navigator": true,
+        "open": true,
+        "removeEventListener": true,
+        "setInterval": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@babel/runtime": true,
+        "browserify>events": true,
+        "eth-json-rpc-middleware>@metamask/eth-sig-util": true,
+        "eth-trezor-keyring>trezor-connect>cross-fetch": true
+      }
+    },
+    "eth-trezor-keyring>trezor-connect>cross-fetch": {
+      "globals": {
+        "Blob": true,
+        "FileReader": true,
+        "FormData": true,
+        "URLSearchParams.prototype.isPrototypeOf": true,
+        "XMLHttpRequest": true
+      }
+    },
+    "ethereumjs-abi": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true,
+        "ethereumjs-abi>ethereumjs-util": true
+      }
+    },
+    "ethereumjs-abi>ethereumjs-util": {
+      "packages": {
+        "bn.js": true,
+        "browserify>assert": true,
+        "browserify>buffer": true,
+        "ethereumjs-abi>ethereumjs-util>ethjs-util": true,
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-util>ethereum-cryptography": true,
+        "ethereumjs-util>rlp": true,
+        "ganache>secp256k1>elliptic": true
+      }
+    },
+    "ethereumjs-abi>ethereumjs-util>ethjs-util": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethjs>ethjs-util>is-hex-prefixed": true,
+        "ethjs>ethjs-util>strip-hex-prefix": true
+      }
+    },
+    "ethereumjs-util": {
+      "packages": {
+        "browserify>assert": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "ethereumjs-util>bn.js": true,
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-util>ethereum-cryptography": true,
+        "ethereumjs-util>rlp": true
+      }
+    },
+    "ethereumjs-util>bn.js": {
+      "globals": {
+        "Buffer": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
+    "ethereumjs-util>create-hash": {
+      "packages": {
+        "addons-linter>sha.js": true,
+        "ethereumjs-util>create-hash>cipher-base": true,
+        "ethereumjs-util>create-hash>md5.js": true,
+        "ethereumjs-util>create-hash>ripemd160": true,
+        "pumpify>inherits": true
+      }
+    },
+    "ethereumjs-util>create-hash>cipher-base": {
+      "packages": {
+        "browserify>stream-browserify": true,
+        "browserify>string_decoder": true,
+        "ethereumjs-wallet>safe-buffer": true,
+        "pumpify>inherits": true
+      }
+    },
+    "ethereumjs-util>create-hash>md5.js": {
+      "packages": {
+        "ethereumjs-util>create-hash>md5.js>hash-base": true,
+        "ethereumjs-wallet>safe-buffer": true,
+        "pumpify>inherits": true
+      }
+    },
+    "ethereumjs-util>create-hash>md5.js>hash-base": {
+      "packages": {
+        "ethereumjs-util>create-hash>md5.js>hash-base>readable-stream": true,
+        "ethereumjs-wallet>safe-buffer": true,
+        "pumpify>inherits": true
+      }
+    },
+    "ethereumjs-util>create-hash>md5.js>hash-base>readable-stream": {
+      "packages": {
+        "@storybook/api>util-deprecate": true,
+        "browserify>browser-resolve": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "browserify>process": true,
+        "browserify>string_decoder": true,
+        "pumpify>inherits": true
+      }
+    },
+    "ethereumjs-util>create-hash>ripemd160": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash>md5.js>hash-base": true,
+        "pumpify>inherits": true
+      }
+    },
+    "ethereumjs-util>ethereum-cryptography": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
+    "ethereumjs-util>ethereum-cryptography>browserify-aes": {
+      "packages": {
+        "browserify>buffer": true,
+        "browserify>crypto-browserify>browserify-cipher>evp_bytestokey": true,
+        "ethereumjs-util>create-hash>cipher-base": true,
+        "ethereumjs-util>ethereum-cryptography>browserify-aes>buffer-xor": true,
+        "ethereumjs-wallet>safe-buffer": true,
+        "pumpify>inherits": true
+      }
+    },
+    "ethereumjs-util>ethereum-cryptography>browserify-aes>buffer-xor": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "ethereumjs-util>ethereum-cryptography>hash.js": {
+      "packages": {
+        "ganache>secp256k1>elliptic>minimalistic-assert": true,
+        "pumpify>inherits": true
+      }
+    },
+    "ethereumjs-util>ethereum-cryptography>keccak": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak>readable-stream": true
+      }
+    },
+    "ethereumjs-util>ethereum-cryptography>keccak>readable-stream": {
+      "packages": {
+        "@storybook/api>util-deprecate": true,
+        "browserify>browser-resolve": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "browserify>process": true,
+        "browserify>string_decoder": true,
+        "pumpify>inherits": true
+      }
+    },
+    "ethereumjs-util>ethereum-cryptography>scrypt-js": {
+      "globals": {
+        "define": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>timers-browserify": true
+      }
+    },
+    "ethereumjs-util>ethereum-cryptography>secp256k1": {
+      "packages": {
+        "ganache>secp256k1>elliptic": true
+      }
+    },
+    "ethereumjs-util>rlp": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>rlp>bn.js": true
+      }
+    },
+    "ethereumjs-util>rlp>bn.js": {
+      "globals": {
+        "Buffer": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
+    "ethereumjs-wallet": {
+      "packages": {
+        "@truffle/codec>utf8": true,
+        "browserify>crypto-browserify": true,
+        "ethereumjs-wallet>aes-js": true,
+        "ethereumjs-wallet>bs58check": true,
+        "ethereumjs-wallet>ethereumjs-util": true,
+        "ethereumjs-wallet>randombytes": true,
+        "ethereumjs-wallet>safe-buffer": true,
+        "ethereumjs-wallet>scryptsy": true,
+        "ethereumjs-wallet>uuid": true
+      }
+    },
+    "ethereumjs-wallet>aes-js": {
+      "globals": {
+        "define": true
+      }
+    },
+    "ethereumjs-wallet>bs58check": {
+      "packages": {
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-wallet>bs58check>bs58": true,
+        "ethereumjs-wallet>safe-buffer": true
+      }
+    },
+    "ethereumjs-wallet>bs58check>bs58": {
+      "packages": {
+        "ethereumjs-wallet>bs58check>bs58>base-x": true
+      }
+    },
+    "ethereumjs-wallet>bs58check>bs58>base-x": {
+      "packages": {
+        "ethereumjs-wallet>safe-buffer": true
+      }
+    },
+    "ethereumjs-wallet>ethereumjs-util": {
+      "packages": {
+        "bn.js": true,
+        "browserify>assert": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-util>ethereum-cryptography": true,
+        "ethereumjs-util>rlp": true,
+        "ethereumjs-wallet>ethereumjs-util>ethjs-util": true,
+        "ganache>secp256k1>elliptic": true
+      }
+    },
+    "ethereumjs-wallet>ethereumjs-util>ethjs-util": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethjs>ethjs-util>is-hex-prefixed": true,
+        "ethjs>ethjs-util>strip-hex-prefix": true
+      }
+    },
+    "ethereumjs-wallet>randombytes": {
+      "globals": {
+        "crypto": true,
+        "msCrypto": true
+      },
+      "packages": {
+        "browserify>process": true,
+        "ethereumjs-wallet>safe-buffer": true
+      }
+    },
+    "ethereumjs-wallet>safe-buffer": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "ethereumjs-wallet>scryptsy": {
+      "packages": {
+        "browserify>buffer": true,
+        "browserify>crypto-browserify>pbkdf2": true
+      }
+    },
+    "ethereumjs-wallet>uuid": {
+      "globals": {
+        "crypto": true,
+        "msCrypto": true
+      }
+    },
+    "ethers>@ethersproject/random": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
+    "ethjs": {
+      "globals": {
+        "clearInterval": true,
+        "setInterval": true
+      },
+      "packages": {
+        "browserify>buffer": true,
+        "ethjs-contract": true,
+        "ethjs-query": true,
+        "ethjs>bn.js": true,
+        "ethjs>ethjs-abi": true,
+        "ethjs>ethjs-filter": true,
+        "ethjs>ethjs-provider-http": true,
+        "ethjs>ethjs-unit": true,
+        "ethjs>ethjs-util": true,
+        "ethjs>js-sha3": true,
+        "ethjs>number-to-bn": true
+      }
+    },
+    "ethjs-contract": {
+      "packages": {
+        "ethjs-contract>ethjs-abi": true,
+        "ethjs-query>babel-runtime": true,
+        "ethjs>ethjs-filter": true,
+        "ethjs>ethjs-util": true,
+        "ethjs>js-sha3": true,
+        "promise-to-callback": true
+      }
+    },
+    "ethjs-contract>ethjs-abi": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethjs-contract>ethjs-abi>bn.js": true,
+        "ethjs>js-sha3": true,
+        "ethjs>number-to-bn": true
+      }
+    },
+    "ethjs-query": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "ethjs-query>ethjs-format": true,
+        "ethjs-query>ethjs-rpc": true,
+        "promise-to-callback": true
+      }
+    },
+    "ethjs-query>babel-runtime": {
+      "packages": {
+        "@babel/runtime": true,
+        "@storybook/api>regenerator-runtime": true,
+        "ethjs-query>babel-runtime>core-js": true
+      }
+    },
+    "ethjs-query>babel-runtime>core-js": {
+      "globals": {
+        "PromiseRejectionEvent": true,
+        "__e": "write",
+        "__g": "write",
+        "document.createTextNode": true,
+        "postMessage": true,
+        "setTimeout": true
+      }
+    },
+    "ethjs-query>ethjs-format": {
+      "packages": {
+        "ethjs-query>ethjs-format>ethjs-schema": true,
+        "ethjs>ethjs-util": true,
+        "ethjs>ethjs-util>strip-hex-prefix": true,
+        "ethjs>number-to-bn": true
+      }
+    },
+    "ethjs-query>ethjs-rpc": {
+      "packages": {
+        "promise-to-callback": true
+      }
+    },
+    "ethjs>ethjs-abi": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethjs>bn.js": true,
+        "ethjs>js-sha3": true,
+        "ethjs>number-to-bn": true
+      }
+    },
+    "ethjs>ethjs-filter": {
+      "globals": {
+        "clearInterval": true,
+        "setInterval": true
+      }
+    },
+    "ethjs>ethjs-provider-http": {
+      "packages": {
+        "ethjs>ethjs-provider-http>xhr2": true
+      }
+    },
+    "ethjs>ethjs-provider-http>xhr2": {
+      "globals": {
+        "XMLHttpRequest": true
+      }
+    },
+    "ethjs>ethjs-unit": {
+      "packages": {
+        "ethjs>ethjs-unit>bn.js": true,
+        "ethjs>number-to-bn": true
+      }
+    },
+    "ethjs>ethjs-util": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethjs>ethjs-util>is-hex-prefixed": true,
+        "ethjs>ethjs-util>strip-hex-prefix": true
+      }
+    },
+    "ethjs>ethjs-util>strip-hex-prefix": {
+      "packages": {
+        "ethjs>ethjs-util>is-hex-prefixed": true
+      }
+    },
+    "ethjs>js-sha3": {
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "ethjs>number-to-bn": {
+      "packages": {
+        "ethjs>ethjs-util>strip-hex-prefix": true,
+        "ethjs>number-to-bn>bn.js": true
+      }
+    },
+    "extension-port-stream": {
+      "packages": {
+        "browserify>buffer": true,
+        "browserify>stream-browserify": true
+      }
+    },
+    "fast-json-patch": {
+      "globals": {
+        "addEventListener": true,
+        "clearTimeout": true,
+        "removeEventListener": true,
+        "setTimeout": true
+      }
+    },
+    "fuse.js": {
+      "globals": {
+        "console": true,
+        "define": true
+      }
+    },
+    "ganache>secp256k1>elliptic": {
+      "packages": {
+        "bn.js": true,
+        "ethereumjs-util>ethereum-cryptography>hash.js": true,
+        "ganache>secp256k1>elliptic>brorand": true,
+        "ganache>secp256k1>elliptic>hmac-drbg": true,
+        "ganache>secp256k1>elliptic>minimalistic-assert": true,
+        "ganache>secp256k1>elliptic>minimalistic-crypto-utils": true,
+        "pumpify>inherits": true
+      }
+    },
+    "ganache>secp256k1>elliptic>brorand": {
+      "globals": {
+        "crypto": true,
+        "msCrypto": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
+    "ganache>secp256k1>elliptic>hmac-drbg": {
+      "packages": {
+        "ethereumjs-util>ethereum-cryptography>hash.js": true,
+        "ganache>secp256k1>elliptic>minimalistic-assert": true,
+        "ganache>secp256k1>elliptic>minimalistic-crypto-utils": true
+      }
+    },
+    "globalthis>define-properties": {
+      "packages": {
+        "globalthis>define-properties>has-property-descriptors": true,
+        "mocha>object.assign>object-keys": true
+      }
+    },
+    "globalthis>define-properties>has-property-descriptors": {
+      "packages": {
+        "string.prototype.matchall>get-intrinsic": true
+      }
+    },
+    "json-rpc-engine": {
+      "packages": {
+        "eth-rpc-errors": true,
+        "json-rpc-engine>@metamask/safe-event-emitter": true
+      }
+    },
+    "json-rpc-engine>@metamask/safe-event-emitter": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>events": true
+      }
+    },
+    "json-rpc-middleware-stream": {
+      "globals": {
+        "console.warn": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "json-rpc-engine>@metamask/safe-event-emitter": true,
+        "readable-stream": true
+      }
+    },
+    "jsonschema": {
+      "packages": {
+        "browserify>url": true
+      }
+    },
+    "koa>is-generator-function>has-tostringtag": {
+      "packages": {
+        "string.prototype.matchall>has-symbols": true
+      }
+    },
+    "lavamoat>json-stable-stringify": {
+      "packages": {
+        "lavamoat>json-stable-stringify>jsonify": true
+      }
+    },
+    "localforage": {
+      "globals": {
+        "Blob": true,
+        "BlobBuilder": true,
+        "FileReader": true,
+        "IDBKeyRange": true,
+        "MSBlobBuilder": true,
+        "MozBlobBuilder": true,
+        "OIndexedDB": true,
+        "WebKitBlobBuilder": true,
+        "atob": true,
+        "btoa": true,
+        "console.error": true,
+        "console.info": true,
+        "console.warn": true,
+        "define": true,
+        "fetch": true,
+        "indexedDB": true,
+        "localStorage": true,
+        "mozIndexedDB": true,
+        "msIndexedDB": true,
+        "navigator.platform": true,
+        "navigator.userAgent": true,
+        "openDatabase": true,
+        "setTimeout": true,
+        "webkitIndexedDB": true
+      }
+    },
+    "lodash": {
+      "globals": {
+        "clearTimeout": true,
+        "define": true,
+        "setTimeout": true
+      }
+    },
+    "loglevel": {
+      "globals": {
+        "console": true,
+        "define": true,
+        "document.cookie": true,
+        "localStorage": true,
+        "log": "write",
+        "navigator": true
+      }
+    },
+    "luxon": {
+      "globals": {
+        "Intl": true
+      }
+    },
+    "madge>ora>bl": {
+      "packages": {
+        "browserify>buffer": true,
+        "madge>ora>bl>readable-stream": true,
+        "pumpify>inherits": true
+      }
+    },
+    "madge>ora>bl>readable-stream": {
+      "packages": {
+        "@storybook/api>util-deprecate": true,
+        "browserify>browser-resolve": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "browserify>process": true,
+        "browserify>string_decoder": true,
+        "pumpify>inherits": true
+      }
+    },
+    "nanoid": {
+      "globals": {
+        "crypto": true,
+        "msCrypto": true,
+        "navigator": true
+      }
+    },
+    "nock>debug": {
+      "globals": {
+        "console": true,
+        "document": true,
+        "localStorage": true,
+        "navigator": true,
+        "process": true
+      },
+      "packages": {
+        "browserify>process": true,
+        "nock>debug>ms": true
+      }
+    },
+    "node-fetch": {
+      "globals": {
+        "Headers": true,
+        "Request": true,
+        "Response": true,
+        "fetch": true
+      }
+    },
+    "nonce-tracker": {
+      "packages": {
+        "await-semaphore": true,
+        "browserify>assert": true,
+        "ethjs-query": true
+      }
+    },
+    "obj-multiplex": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "end-of-stream": true,
+        "pump>once": true,
+        "readable-stream": true
+      }
+    },
+    "promise-to-callback": {
+      "packages": {
+        "promise-to-callback>is-fn": true,
+        "promise-to-callback>set-immediate-shim": true
+      }
+    },
+    "promise-to-callback>set-immediate-shim": {
+      "globals": {
+        "setTimeout.apply": true
+      },
+      "packages": {
+        "browserify>timers-browserify": true
+      }
+    },
+    "prop-types": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "prop-types>react-is": true,
+        "react>object-assign": true
+      }
+    },
+    "prop-types>react-is": {
+      "globals": {
+        "console": true
+      }
+    },
+    "pubnub": {
+      "globals": {
+        "ActiveXObject": true,
+        "XMLHttpRequest": true,
+        "addEventListener": true,
+        "btoa": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console": true,
+        "define": true,
+        "localStorage.getItem": true,
+        "localStorage.setItem": true,
+        "location": true,
+        "navigator": true,
+        "setInterval": true,
+        "setTimeout": true
+      }
+    },
+    "pubnub>cbor-sync": {
+      "globals": {
+        "define": true
+      },
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "pump": {
+      "packages": {
+        "browserify>browser-resolve": true,
+        "browserify>process": true,
+        "end-of-stream": true,
+        "pump>once": true
+      }
+    },
+    "pump>once": {
+      "packages": {
+        "pump>once>wrappy": true
+      }
+    },
+    "qrcode-generator": {
+      "globals": {
+        "define": true
+      }
+    },
+    "qrcode.react": {
+      "globals": {
+        "Path2D": true,
+        "devicePixelRatio": true
+      },
+      "packages": {
+        "prop-types": true,
+        "qrcode.react>qr.js": true,
+        "react": true
+      }
+    },
+    "react": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "prop-types": true,
+        "react>object-assign": true
+      }
+    },
+    "react-devtools": {
+      "packages": {
+        "react-devtools>react-devtools-core": true
+      }
+    },
+    "react-devtools>react-devtools-core": {
+      "globals": {
+        "WebSocket": true,
+        "setTimeout": true
+      }
+    },
+    "react-dnd-html5-backend": {
+      "globals": {
+        "addEventListener": true,
+        "clearTimeout": true,
+        "removeEventListener": true
+      }
+    },
+    "react-dom": {
+      "globals": {
+        "HTMLIFrameElement": true,
+        "MSApp": true,
+        "__REACT_DEVTOOLS_GLOBAL_HOOK__": true,
+        "addEventListener": true,
+        "clearTimeout": true,
+        "clipboardData": true,
+        "console": true,
+        "dispatchEvent": true,
+        "document": true,
+        "event": "write",
+        "jest": true,
+        "location.protocol": true,
+        "navigator.userAgent.indexOf": true,
+        "performance": true,
+        "removeEventListener": true,
+        "self": true,
+        "setTimeout": true,
+        "top": true,
+        "trustedTypes": true
+      },
+      "packages": {
+        "prop-types": true,
+        "react": true,
+        "react-dom>scheduler": true,
+        "react>object-assign": true
+      }
+    },
+    "react-dom>scheduler": {
+      "globals": {
+        "MessageChannel": true,
+        "cancelAnimationFrame": true,
+        "clearTimeout": true,
+        "console": true,
+        "navigator": true,
+        "performance": true,
+        "requestAnimationFrame": true,
+        "setTimeout": true
+      }
+    },
+    "react-idle-timer": {
+      "globals": {
+        "clearTimeout": true,
+        "document": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "prop-types": true,
+        "react": true
+      }
+    },
+    "react-inspector": {
+      "globals": {
+        "Node.CDATA_SECTION_NODE": true,
+        "Node.COMMENT_NODE": true,
+        "Node.DOCUMENT_FRAGMENT_NODE": true,
+        "Node.DOCUMENT_NODE": true,
+        "Node.DOCUMENT_TYPE_NODE": true,
+        "Node.ELEMENT_NODE": true,
+        "Node.PROCESSING_INSTRUCTION_NODE": true,
+        "Node.TEXT_NODE": true
+      },
+      "packages": {
+        "ethjs-query>babel-runtime": true,
+        "prop-types": true,
+        "react": true,
+        "react-inspector>is-dom": true
+      }
+    },
+    "react-inspector>is-dom": {
+      "globals": {
+        "Node": true
+      },
+      "packages": {
+        "@lavamoat/snow>is-cross-origin>is-window": true,
+        "proxyquire>fill-keys>is-object": true
+      }
+    },
+    "react-markdown": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "prop-types": true,
+        "react": true,
+        "react-markdown>comma-separated-tokens": true,
+        "react-markdown>property-information": true,
+        "react-markdown>react-is": true,
+        "react-markdown>remark-parse": true,
+        "react-markdown>remark-rehype": true,
+        "react-markdown>space-separated-tokens": true,
+        "react-markdown>style-to-object": true,
+        "react-markdown>unified": true,
+        "react-markdown>unist-util-visit": true,
+        "react-markdown>vfile": true
+      }
+    },
+    "react-markdown>property-information": {
+      "packages": {
+        "watchify>xtend": true
+      }
+    },
+    "react-markdown>react-is": {
+      "globals": {
+        "console": true
+      }
+    },
+    "react-markdown>remark-parse": {
+      "packages": {
+        "react-markdown>remark-parse>mdast-util-from-markdown": true
+      }
+    },
+    "react-markdown>remark-parse>mdast-util-from-markdown": {
+      "packages": {
+        "react-markdown>remark-parse>mdast-util-from-markdown>mdast-util-to-string": true,
+        "react-markdown>remark-parse>mdast-util-from-markdown>micromark": true,
+        "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities": true,
+        "react-markdown>vfile>unist-util-stringify-position": true
+      }
+    },
+    "react-markdown>remark-parse>mdast-util-from-markdown>micromark": {
+      "packages": {
+        "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities": true
+      }
+    },
+    "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities": {
+      "globals": {
+        "document.createElement": true
+      }
+    },
+    "react-markdown>remark-rehype": {
+      "packages": {
+        "react-markdown>remark-rehype>mdast-util-to-hast": true
+      }
+    },
+    "react-markdown>remark-rehype>mdast-util-to-hast": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "react-markdown>remark-rehype>mdast-util-to-hast>mdast-util-definitions": true,
+        "react-markdown>remark-rehype>mdast-util-to-hast>mdurl": true,
+        "react-markdown>remark-rehype>mdast-util-to-hast>unist-builder": true,
+        "react-markdown>remark-rehype>mdast-util-to-hast>unist-util-generated": true,
+        "react-markdown>remark-rehype>mdast-util-to-hast>unist-util-position": true,
+        "react-markdown>unist-util-visit": true
+      }
+    },
+    "react-markdown>remark-rehype>mdast-util-to-hast>mdast-util-definitions": {
+      "packages": {
+        "react-markdown>unist-util-visit": true
+      }
+    },
+    "react-markdown>style-to-object": {
+      "packages": {
+        "react-markdown>style-to-object>inline-style-parser": true
+      }
+    },
+    "react-markdown>unified": {
+      "packages": {
+        "jsdom>request>extend": true,
+        "react-markdown>unified>bail": true,
+        "react-markdown>unified>is-buffer": true,
+        "react-markdown>unified>is-plain-obj": true,
+        "react-markdown>unified>trough": true,
+        "react-markdown>vfile": true
+      }
+    },
+    "react-markdown>unist-util-visit": {
+      "packages": {
+        "react-markdown>unist-util-visit>unist-util-visit-parents": true
+      }
+    },
+    "react-markdown>unist-util-visit>unist-util-visit-parents": {
+      "packages": {
+        "react-markdown>unist-util-visit>unist-util-is": true
+      }
+    },
+    "react-markdown>vfile": {
+      "packages": {
+        "browserify>path-browserify": true,
+        "browserify>process": true,
+        "react-markdown>vfile>is-buffer": true,
+        "react-markdown>vfile>vfile-message": true,
+        "vinyl>replace-ext": true
+      }
+    },
+    "react-markdown>vfile>vfile-message": {
+      "packages": {
+        "react-markdown>vfile>unist-util-stringify-position": true
+      }
+    },
+    "react-popper": {
+      "globals": {
+        "document": true
+      },
+      "packages": {
+        "@popperjs/core": true,
+        "react": true,
+        "react-popper>react-fast-compare": true,
+        "react-popper>warning": true
+      }
+    },
+    "react-popper>react-fast-compare": {
+      "globals": {
+        "Element": true,
+        "console.warn": true
+      }
+    },
+    "react-popper>warning": {
+      "globals": {
+        "console": true
+      }
+    },
+    "react-redux": {
+      "globals": {
+        "console": true,
+        "document": true
+      },
+      "packages": {
+        "@babel/runtime": true,
+        "prop-types": true,
+        "prop-types>react-is": true,
+        "react": true,
+        "react-dom": true,
+        "react-redux>hoist-non-react-statics": true,
+        "redux": true
+      }
+    },
+    "react-redux>hoist-non-react-statics": {
+      "packages": {
+        "prop-types>react-is": true
+      }
+    },
+    "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
+      }
+    },
+    "react-router-dom": {
+      "packages": {
+        "prop-types": true,
+        "react": true,
+        "react-router-dom>history": true,
+        "react-router-dom>react-router": true,
+        "react-router-dom>tiny-invariant": true,
+        "react-router-dom>tiny-warning": true
+      }
+    },
+    "react-router-dom>history": {
+      "globals": {
+        "addEventListener": true,
+        "confirm": true,
+        "document": true,
+        "history": true,
+        "location": true,
+        "navigator.userAgent": true,
+        "removeEventListener": true
+      },
+      "packages": {
+        "react-router-dom>history>resolve-pathname": true,
+        "react-router-dom>history>value-equal": true,
+        "react-router-dom>tiny-invariant": true,
+        "react-router-dom>tiny-warning": true
+      }
+    },
+    "react-router-dom>react-router": {
+      "packages": {
+        "prop-types": true,
+        "prop-types>react-is": true,
+        "react": true,
+        "react-redux>hoist-non-react-statics": true,
+        "react-router-dom>react-router>history": true,
+        "react-router-dom>react-router>mini-create-react-context": true,
+        "react-router-dom>tiny-invariant": true,
+        "react-router-dom>tiny-warning": true,
+        "sinon>nise>path-to-regexp": true
+      }
+    },
+    "react-router-dom>react-router>history": {
+      "globals": {
+        "addEventListener": true,
+        "confirm": true,
+        "document": true,
+        "history": true,
+        "location": true,
+        "navigator.userAgent": true,
+        "removeEventListener": true
+      },
+      "packages": {
+        "react-router-dom>history>resolve-pathname": true,
+        "react-router-dom>history>value-equal": true,
+        "react-router-dom>tiny-invariant": true,
+        "react-router-dom>tiny-warning": true
+      }
+    },
+    "react-router-dom>react-router>mini-create-react-context": {
+      "packages": {
+        "@babel/runtime": true,
+        "prop-types": true,
+        "react": true,
+        "react-router-dom>react-router>mini-create-react-context>gud": true,
+        "react-router-dom>tiny-warning": true
+      }
+    },
+    "react-router-dom>tiny-warning": {
+      "globals": {
+        "console": true
+      }
+    },
+    "react-simple-file-input": {
+      "globals": {
+        "File": true,
+        "FileReader": true,
+        "console.warn": true
+      },
+      "packages": {
+        "prop-types": true,
+        "react": true
+      }
+    },
+    "react-tippy": {
+      "globals": {
+        "Element": true,
+        "MSStream": true,
+        "MutationObserver": true,
+        "addEventListener": true,
+        "clearTimeout": true,
+        "console.error": true,
+        "console.warn": true,
+        "define": true,
+        "document": true,
+        "getComputedStyle": true,
+        "innerHeight": true,
+        "innerWidth": true,
+        "navigator.maxTouchPoints": true,
+        "navigator.msMaxTouchPoints": true,
+        "navigator.userAgent": true,
+        "performance": true,
+        "requestAnimationFrame": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "react": true,
+        "react-dom": true,
+        "react-tippy>popper.js": true
+      }
+    },
+    "react-tippy>popper.js": {
+      "globals": {
+        "MSInputMethodContext": true,
+        "Node.DOCUMENT_POSITION_FOLLOWING": true,
+        "cancelAnimationFrame": true,
+        "console.warn": true,
+        "define": true,
+        "devicePixelRatio": true,
+        "document": true,
+        "getComputedStyle": true,
+        "innerHeight": true,
+        "innerWidth": true,
+        "navigator.userAgent": true,
+        "requestAnimationFrame": true,
+        "setTimeout": true
+      }
+    },
+    "react-toggle-button": {
+      "globals": {
+        "clearTimeout": true,
+        "console.warn": true,
+        "define": true,
+        "performance": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "react": true
+      }
+    },
+    "react-transition-group": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "prop-types": true,
+        "react": true,
+        "react-dom": true,
+        "react-transition-group>chain-function": true,
+        "react-transition-group>dom-helpers": true,
+        "react-transition-group>warning": true
+      }
+    },
+    "react-transition-group>dom-helpers": {
+      "globals": {
+        "document": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@babel/runtime": true
+      }
+    },
+    "react-transition-group>warning": {
+      "globals": {
+        "console": true
+      }
+    },
+    "readable-stream": {
+      "packages": {
+        "@storybook/api>util-deprecate": true,
+        "browserify>browser-resolve": true,
+        "browserify>events": true,
+        "browserify>process": true,
+        "browserify>timers-browserify": true,
+        "pumpify>inherits": true,
+        "readable-stream>core-util-is": true,
+        "readable-stream>isarray": true,
+        "readable-stream>process-nextick-args": true,
+        "readable-stream>safe-buffer": true,
+        "readable-stream>string_decoder": true
+      }
+    },
+    "readable-stream>core-util-is": {
+      "packages": {
+        "browserify>insert-module-globals>is-buffer": true
+      }
+    },
+    "readable-stream>process-nextick-args": {
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "readable-stream>safe-buffer": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "readable-stream>string_decoder": {
+      "packages": {
+        "readable-stream>safe-buffer": true
+      }
+    },
+    "redux": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "@babel/runtime": true
+      }
+    },
+    "safe-event-emitter": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>util": true,
+        "webpack>events": true
+      }
+    },
+    "semver": {
+      "globals": {
+        "console.error": true
+      },
+      "packages": {
+        "browserify>process": true,
+        "semver>lru-cache": true
+      }
+    },
+    "semver>lru-cache": {
+      "packages": {
+        "semver>lru-cache>yallist": true
+      }
+    },
+    "sinon>nise>path-to-regexp": {
+      "packages": {
+        "sinon>nise>path-to-regexp>isarray": true
+      }
+    },
+    "string.prototype.matchall>call-bind": {
+      "packages": {
+        "mocha>object.assign>function-bind": true,
+        "string.prototype.matchall>get-intrinsic": true
+      }
+    },
+    "string.prototype.matchall>get-intrinsic": {
+      "globals": {
+        "AggregateError": true,
+        "FinalizationRegistry": true,
+        "WeakRef": true
+      },
+      "packages": {
+        "enzyme>has": true,
+        "mocha>object.assign>function-bind": true,
+        "string.prototype.matchall>has-symbols": true
+      }
+    },
+    "string.prototype.matchall>regexp.prototype.flags": {
+      "packages": {
+        "enzyme>function.prototype.name>functions-have-names": true,
+        "globalthis>define-properties": true,
+        "string.prototype.matchall>call-bind": true
+      }
+    },
+    "terser>source-map-support>buffer-from": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "uuid": {
+      "globals": {
+        "crypto": true,
+        "msCrypto": true
+      }
+    },
+    "vinyl>clone": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "vinyl>replace-ext": {
+      "packages": {
+        "browserify>path-browserify": true
+      }
+    },
+    "web3": {
+      "globals": {
+        "XMLHttpRequest": true
+      }
+    },
+    "web3-stream-provider": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>util": true,
+        "readable-stream": true,
+        "web3-stream-provider>uuid": true
+      }
+    },
+    "web3-stream-provider>uuid": {
+      "globals": {
+        "crypto": true,
+        "msCrypto": true
+      }
+    },
+    "webextension-polyfill": {
+      "globals": {
+        "browser": true,
+        "chrome": true,
+        "console.error": true,
+        "console.warn": true,
+        "define": true
+      }
+    },
+    "webpack>events": {
+      "globals": {
+        "console": true
       }
     }
-  }
\ No newline at end of file
+  }
+}
\ No newline at end of file

From da8fe7ea62aff41f38408619248f7adc297765c8 Mon Sep 17 00:00:00 2001
From: Maarten Zuidhoorn <maarten@zuidhoorn.com>
Date: Thu, 16 Feb 2023 10:35:11 +0100
Subject: [PATCH 25/36] [FLASK] Temporarily disable JSON-RPC snap e2e test
 (#17778)

* Temporarily disable JSON-RPC snap e2e test

* Update outdated snapshot
---
 test/e2e/snaps/test-snap-rpc.spec.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/e2e/snaps/test-snap-rpc.spec.js b/test/e2e/snaps/test-snap-rpc.spec.js
index 572d8fc68..166d0b265 100644
--- a/test/e2e/snaps/test-snap-rpc.spec.js
+++ b/test/e2e/snaps/test-snap-rpc.spec.js
@@ -4,7 +4,9 @@ const FixtureBuilder = require('../fixture-builder');
 const { TEST_SNAPS_WEBSITE_URL } = require('./enums');
 
 describe('Test Snap RPC', function () {
-  it('can use the cross-snap RPC endowment and produce a public key', async function () {
+  // TODO: Re-enable this test once `test-snaps` is fixed.
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('can use the cross-snap RPC endowment and produce a public key', async function () {
     const ganacheOptions = {
       accounts: [
         {

From 98b17d0038775843af727ff11d6e76e0e497deaa Mon Sep 17 00:00:00 2001
From: PeterYinusa <peter.yinusa@consensys.net>
Date: Tue, 7 Mar 2023 19:42:11 +0000
Subject: [PATCH 26/36] Update CHANGELOG.md

---
 CHANGELOG.md | 217 ++++++++++++---------------------------------------
 1 file changed, 50 insertions(+), 167 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 929827745..005691832 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,176 +7,59 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [10.26.0]
-### Uncategorized
-- Sync `master` with `develop` ([#17665](https://github.com/MetaMask/metamask-extension/pull/17665))
-- Deprecating Typography component ([#17672](https://github.com/MetaMask/metamask-extension/pull/17672))
-- remove siwe feature flag ([#17690](https://github.com/MetaMask/metamask-extension/pull/17690))
-- Fix recent recipient order ([#16346](https://github.com/MetaMask/metamask-extension/pull/16346))
-- Add testing documentation ([#17411](https://github.com/MetaMask/metamask-extension/pull/17411))
-- Merge branch 'develop' into master-sync
-- Fix for error during sending to multisig address ([#17651](https://github.com/MetaMask/metamask-extension/pull/17651))
-- UX: Update block explorer icon ([#17562](https://github.com/MetaMask/metamask-extension/pull/17562))
-- Merge branch 'develop' into master-sync
-- fix test of useTransactionDisplayData for different timezone ([#17063](https://github.com/MetaMask/metamask-extension/pull/17063))
-- Sanitising string on signature request pages ([#17571](https://github.com/MetaMask/metamask-extension/pull/17571))
-- Conflict cleanup 10.25.0 master-sync
-- Merge remote-tracking branch 'origin/develop' into master-sync
-- Expand network controller unit test coverage ([#17498](https://github.com/MetaMask/metamask-extension/pull/17498))
-- Detect and track UI customizations on Personal Sign Requests ([#16222](https://github.com/MetaMask/metamask-extension/pull/16222))
-- Sign-in with Ethereum Domain Binding ([#16616](https://github.com/MetaMask/metamask-extension/pull/16616))
-- Update `json-rpc-middleware-stream` from v2 to v4 ([#17588](https://github.com/MetaMask/metamask-extension/pull/17588))
-- converted collectibles files to nfts ([#17658](https://github.com/MetaMask/metamask-extension/pull/17658))
-- E2e test insights ([#17535](https://github.com/MetaMask/metamask-extension/pull/17535))
-- [TS dashboard] Reorganize files slightly ([#17335](https://github.com/MetaMask/metamask-extension/pull/17335))
-- add brad-decker as codeowner of .circle/ folder ([#17648](https://github.com/MetaMask/metamask-extension/pull/17648))
-- Sort permissions based on weight ([#17660](https://github.com/MetaMask/metamask-extension/pull/17660))
-- Refactor ConfirmTransaction to Functional Component ([#17473](https://github.com/MetaMask/metamask-extension/pull/17473))
-- Add desktop build type ([#17592](https://github.com/MetaMask/metamask-extension/pull/17592))
-- add double arrow icons ([#17654](https://github.com/MetaMask/metamask-extension/pull/17654))
-- Add e2e test: send nft  ([#17638](https://github.com/MetaMask/metamask-extension/pull/17638))
-- Adding docs for layout and spacing for Icon component ([#17612](https://github.com/MetaMask/metamask-extension/pull/17612))
-- Collectible Unit Tests ([#17632](https://github.com/MetaMask/metamask-extension/pull/17632))
-- Update BannerAlert component ([#17586](https://github.com/MetaMask/metamask-extension/pull/17586))
-- fix: update ledger logo ([#17616](https://github.com/MetaMask/metamask-extension/pull/17616))
-- Add hardcoded list of human-readable snap derivation paths ([#17627](https://github.com/MetaMask/metamask-extension/pull/17627))
-- [FLASK] Create E2E test for RPC endowment ([#17525](https://github.com/MetaMask/metamask-extension/pull/17525))
-- Added metric Phishing Page Displayed for phishing warning page ([#17462](https://github.com/MetaMask/metamask-extension/pull/17462))
-- updated assets and phishing controller packages ([#17569](https://github.com/MetaMask/metamask-extension/pull/17569))
-- UX: Fix token image not displaying in asset listing ([#17575](https://github.com/MetaMask/metamask-extension/pull/17575))
-- Prevent lint warning in ActionableMessage ([#17598](https://github.com/MetaMask/metamask-extension/pull/17598))
-- [doc] add Jest debugging guide (docs/tests/jest.md) ([#17594](https://github.com/MetaMask/metamask-extension/pull/17594))
-- Add hardcoded list of human-readable snap names ([#17595](https://github.com/MetaMask/metamask-extension/pull/17595))
-- NFTs: Update event name for Detect NFT settings ([#17597](https://github.com/MetaMask/metamask-extension/pull/17597))
-- Change COLORS reference to Color ([#17599](https://github.com/MetaMask/metamask-extension/pull/17599))
-- UX: Remove the IconCopy and IconCopied Components and their usages ([#17530](https://github.com/MetaMask/metamask-extension/pull/17530))
-- UX: Update support icon ([#17560](https://github.com/MetaMask/metamask-extension/pull/17560))
-- Convert actions.js to typescript ([#17446](https://github.com/MetaMask/metamask-extension/pull/17446))
-- Disable fiat conversion in Approve Screen when `Show balance and token price checker` is OFF ([#17443](https://github.com/MetaMask/metamask-extension/pull/17443))
-- Ensure the advanced gas modal displays a zero priority fee if that is how it is set in the transaction ([#17559](https://github.com/MetaMask/metamask-extension/pull/17559))
-- feature: convert ui/ducks/app/app.ts to typescript ([#17454](https://github.com/MetaMask/metamask-extension/pull/17454))
-- Fix speed up of 0 max priority fee transactions ([#17547](https://github.com/MetaMask/metamask-extension/pull/17547))
-- update banner base component ([#17582](https://github.com/MetaMask/metamask-extension/pull/17582))
-- updated tag icon ([#17540](https://github.com/MetaMask/metamask-extension/pull/17540))
-- decrease coverage threshold that requires bump ([#17544](https://github.com/MetaMask/metamask-extension/pull/17544))
-- Dead and redundant code removal ([#17512](https://github.com/MetaMask/metamask-extension/pull/17512))
-- initialize currentLocale in the locale slice upon app start ([#17579](https://github.com/MetaMask/metamask-extension/pull/17579))
-- fix: fix non-critical warning in tests ([#17567](https://github.com/MetaMask/metamask-extension/pull/17567))
-- feature: migrate design-system.ts ([#17518](https://github.com/MetaMask/metamask-extension/pull/17518))
-- Convert store.js to typescript and redux toolkit ([#17508](https://github.com/MetaMask/metamask-extension/pull/17508))
-- Add error module for safely handling errors ([#17511](https://github.com/MetaMask/metamask-extension/pull/17511))
-- Convert action-queue to TypeScript ([#17509](https://github.com/MetaMask/metamask-extension/pull/17509))
-- Add network client tests for methods not supported by Infura ([#17347](https://github.com/MetaMask/metamask-extension/pull/17347))
-- Add e2e test:  import nft ([#17543](https://github.com/MetaMask/metamask-extension/pull/17543))
+### Added
 - Adding browser outdated notification ([#17027](https://github.com/MetaMask/metamask-extension/pull/17027))
-- Convert confirm-tx.utils.js to typescript ([#17349](https://github.com/MetaMask/metamask-extension/pull/17349))
-- updated CollectibleDetail Storybook Coverage ([#17351](https://github.com/MetaMask/metamask-extension/pull/17351))
-- adding textfix on experimental tab ([#17306](https://github.com/MetaMask/metamask-extension/pull/17306))
-- Allow background to handle forgotten password flow ([#17501](https://github.com/MetaMask/metamask-extension/pull/17501))
-- GasDisplay: fix z-index for Confirm Approve warning ([#17470](https://github.com/MetaMask/metamask-extension/pull/17470))
-- Fix http-cache-semantics dependency vulnerability GHSA-rc47-6667-2j5j ([#17563](https://github.com/MetaMask/metamask-extension/pull/17563))
-- Detailed document for refactoring signature request pages in extension ([#17456](https://github.com/MetaMask/metamask-extension/pull/17456))
-- Move confirm-transaction/conf-tx.js to confirm-signature-request ([#17408](https://github.com/MetaMask/metamask-extension/pull/17408))
-- remove nft toaster on first autohide ([#17536](https://github.com/MetaMask/metamask-extension/pull/17536))
-- Convert ui/store/actionConstants.js -> Typescript ([#17442](https://github.com/MetaMask/metamask-extension/pull/17442))
-- Fixing yarn version command, adding yarn version plugin ([#17325](https://github.com/MetaMask/metamask-extension/pull/17325))
-- 🐛 Calldata validation ([#17326](https://github.com/MetaMask/metamask-extension/pull/17326))
-- remove unused banner base proptype ([#17531](https://github.com/MetaMask/metamask-extension/pull/17531))
-- Add tests for `retryOnEmpty` middleware ([#17364](https://github.com/MetaMask/metamask-extension/pull/17364))
-- prefer locale slice for locale state ([#17499](https://github.com/MetaMask/metamask-extension/pull/17499))
-- Fixing/extending type definitions for later usage ([#17514](https://github.com/MetaMask/metamask-extension/pull/17514))
-- TypeScript tooling fixes ([#17513](https://github.com/MetaMask/metamask-extension/pull/17513))
-- Onboarding V2: Remove old onboarding flow ([#17081](https://github.com/MetaMask/metamask-extension/pull/17081))
-- Fix build ([#17538](https://github.com/MetaMask/metamask-extension/pull/17538))
-- fix button text props ([#17478](https://github.com/MetaMask/metamask-extension/pull/17478))
-- Refactoring confirm-transaction-base component ([#17484](https://github.com/MetaMask/metamask-extension/pull/17484))
-- Refactor conf-tx.js ([#17380](https://github.com/MetaMask/metamask-extension/pull/17380))
-- Fix RPC Url editing issue of existing network ([#17451](https://github.com/MetaMask/metamask-extension/pull/17451))
-- Adjust 'Confirm' button color on setApprovalForAll revocations ([#17506](https://github.com/MetaMask/metamask-extension/pull/17506))
-- Move THEME_TYPE to new preferences.ts file ([#17515](https://github.com/MetaMask/metamask-extension/pull/17515))
-- Fix #17328 - Move NFT settings to Experimental ([#17400](https://github.com/MetaMask/metamask-extension/pull/17400))
-- UX - Update all copy icons ([#17445](https://github.com/MetaMask/metamask-extension/pull/17445))
-- Added navigation between multiple sign prompts and reject all sign prompts ([#17093](https://github.com/MetaMask/metamask-extension/pull/17093))
-- Fix #17439 - Prevent event error when user presses enter key during onboarding ([#17497](https://github.com/MetaMask/metamask-extension/pull/17497))
-- Update overview icons for buy, send, and swap ([#17492](https://github.com/MetaMask/metamask-extension/pull/17492))
-- New Icons: Replace instance of fa-qr-code icon ([#17474](https://github.com/MetaMask/metamask-extension/pull/17474))
-- Fix #17441 - Update all MenuItem instances to use new icons ([#17468](https://github.com/MetaMask/metamask-extension/pull/17468))
-- Fix #17393 - Fix NFT collection header image ([#17394](https://github.com/MetaMask/metamask-extension/pull/17394))
-- Add e2e test: add custome network during onboarding ([#17436](https://github.com/MetaMask/metamask-extension/pull/17436))
-- feat(mme-17214): migrate L33 files to typescript ([#17372](https://github.com/MetaMask/metamask-extension/pull/17372))
-- Update copy when revoking setApprovalForAll ([#17500](https://github.com/MetaMask/metamask-extension/pull/17500))
-- master sync following v10.24.2 ([#17504](https://github.com/MetaMask/metamask-extension/pull/17504))
-- Merge remote-tracking branch 'origin/develop' into master-sync
-- Update home portfolio dapp icon to new icon ([#17471](https://github.com/MetaMask/metamask-extension/pull/17471))
-- Document `displayWarning` as deprecated ([#17465](https://github.com/MetaMask/metamask-extension/pull/17465))
-- Ignore `storybook-build` lint errors ([#17373](https://github.com/MetaMask/metamask-extension/pull/17373))
-- remove snap notifications when uninstalled ([#17487](https://github.com/MetaMask/metamask-extension/pull/17487))
-- Nft build for e2e tests ([#17430](https://github.com/MetaMask/metamask-extension/pull/17430))
-- feature: convert level 32 files to typescript ([#17390](https://github.com/MetaMask/metamask-extension/pull/17390))
-- [e2e]Add e2e test for deleting custom network ([#17254](https://github.com/MetaMask/metamask-extension/pull/17254))
-- Fix #17362 - Ensure NFT icons are correct ([#17440](https://github.com/MetaMask/metamask-extension/pull/17440))
-- Fix #17385 - Provide autohide callback for ActionMessage ([#17392](https://github.com/MetaMask/metamask-extension/pull/17392))
-- button link housekeeping ([#16885](https://github.com/MetaMask/metamask-extension/pull/16885))
-- Bump lavapack version to 5 ([#17431](https://github.com/MetaMask/metamask-extension/pull/17431))
-- feature: convert shared/modules/contract-utils.test.js to typescript ([#17435](https://github.com/MetaMask/metamask-extension/pull/17435))
-- Refactor confirm page container component from class to functional component ([#16907](https://github.com/MetaMask/metamask-extension/pull/16907))
-- Test parameter change cache miss ([#17346](https://github.com/MetaMask/metamask-extension/pull/17346))
-- Document callback-style background calls as deprecated ([#17376](https://github.com/MetaMask/metamask-extension/pull/17376))
-- [GridPlus] Bumps `gridplus-sdk` to v2.4.1 ([#16847](https://github.com/MetaMask/metamask-extension/pull/16847))
-- Put hardware wallets behind an HARDWARE_WALLETS_MV3 flag ([#17354](https://github.com/MetaMask/metamask-extension/pull/17354))
-- Consolidated all component import paths ([#17368](https://github.com/MetaMask/metamask-extension/pull/17368))
-- updated new links for the stories ([#17369](https://github.com/MetaMask/metamask-extension/pull/17369))
-- Fix #17388 - Remove dismiss button from NFT notification ([#17389](https://github.com/MetaMask/metamask-extension/pull/17389))
-- Remove a notification for falling back from STX to regular swaps ([#17374](https://github.com/MetaMask/metamask-extension/pull/17374))
-- Feat/15086/add banner severities component ([#17307](https://github.com/MetaMask/metamask-extension/pull/17307))
-- fix icon names ([#17391](https://github.com/MetaMask/metamask-extension/pull/17391))
-- Fix Playwright install step ([#17415](https://github.com/MetaMask/metamask-extension/pull/17415))
-- Fix broken NFT import and auto-detect flows ([#17384](https://github.com/MetaMask/metamask-extension/pull/17384))
-- Convert ui/helpers/constants/common to typescript ([#17348](https://github.com/MetaMask/metamask-extension/pull/17348))
-- Copy update on Transaction breakdown for ApproveToken ([#17296](https://github.com/MetaMask/metamask-extension/pull/17296))
-- Add alt text for NFT images ([#17284](https://github.com/MetaMask/metamask-extension/pull/17284))
-- Nit fixes for story-test integration ([#17344](https://github.com/MetaMask/metamask-extension/pull/17344))
-- remove duplicate comment line ([#17381](https://github.com/MetaMask/metamask-extension/pull/17381))
-- Complete level 36 migration of TypeScript by converting conversion.utils.js and deprecate old conversion util ([#17262](https://github.com/MetaMask/metamask-extension/pull/17262))
-- icon audit, remove xxs icon size ([#17089](https://github.com/MetaMask/metamask-extension/pull/17089))
-- Activate LavaMoat scuttling security feature ([#17276](https://github.com/MetaMask/metamask-extension/pull/17276))
-- feat(mme-17212): convert shared/constants/swaps.js -> Typescript ([#17322](https://github.com/MetaMask/metamask-extension/pull/17322))
-- Add Firefox Snow support ([#17147](https://github.com/MetaMask/metamask-extension/pull/17147))
-- Move subject type enum to `@metamask/subject-metadata-controller` ([#16431](https://github.com/MetaMask/metamask-extension/pull/16431))
-- Replace usages of conversion util in rest of UI folder in favor of Numeric ([#17334](https://github.com/MetaMask/metamask-extension/pull/17334))
-- Fix/use etherjs specific imports ([#15461](https://github.com/MetaMask/metamask-extension/pull/15461))
-- Fix #17300, #16843 - Use proper source for image of IPFS NFTs ([#17302](https://github.com/MetaMask/metamask-extension/pull/17302))
-- Sync `master` with `develop` ([#17359](https://github.com/MetaMask/metamask-extension/pull/17359))
-- [FLASK] `snaps-monorepo@0.28.0` ([#17277](https://github.com/MetaMask/metamask-extension/pull/17277))
-- Remove usages of Conversion util in components folder in favor of Numeric ([#17333](https://github.com/MetaMask/metamask-extension/pull/17333))
-- Refactor Errors E2E test to no longer rely upon a real error ([#17332](https://github.com/MetaMask/metamask-extension/pull/17332))
-- Merge remote-tracking branch 'origin/develop' into master-sync
-- Fix cookiejar dependency vulnerability ([#17355](https://github.com/MetaMask/metamask-extension/pull/17355))
-- [FLASK] Update onboarding text to fit new panel ([#17345](https://github.com/MetaMask/metamask-extension/pull/17345))
-- Refactor usages of conversion util in the app folder and shared folder in favor of Numeric ([#17331](https://github.com/MetaMask/metamask-extension/pull/17331))
-- Updated Icons in Title of NFTs ([#17205](https://github.com/MetaMask/metamask-extension/pull/17205))
-- Enable the Token Allowance flow by default for all users ([#16740](https://github.com/MetaMask/metamask-extension/pull/16740))
-- Convert app//scripts/lib/util.js to typescript ([#17330](https://github.com/MetaMask/metamask-extension/pull/17330))
-- Restore support for Chromium v78 ([#17251](https://github.com/MetaMask/metamask-extension/pull/17251))
-- Added fix for overlaping text in mozzila in activity tab ([#17235](https://github.com/MetaMask/metamask-extension/pull/17235))
-- Use PageContainerFooter to render footer on all confirmation pages ([#17316](https://github.com/MetaMask/metamask-extension/pull/17316))
-- chore: copy update for metamask fee on swaps ([#17133](https://github.com/MetaMask/metamask-extension/pull/17133))
-- Security provider check (OpenSea) ([#16584](https://github.com/MetaMask/metamask-extension/pull/16584))
-- Setup network controller mocks per-test ([#17250](https://github.com/MetaMask/metamask-extension/pull/17250))
-- Added toaster for removed NFTs ([#17297](https://github.com/MetaMask/metamask-extension/pull/17297))
-- Integrate `KeyringController` v10 ([#17056](https://github.com/MetaMask/metamask-extension/pull/17056))
-- add numeric module ([#17324](https://github.com/MetaMask/metamask-extension/pull/17324))
-- Convert app/scripts/constants -> Typescript ([#17327](https://github.com/MetaMask/metamask-extension/pull/17327))
-- Use async/await instead of Promise.resolve ([#16221](https://github.com/MetaMask/metamask-extension/pull/16221))
-- Added storybook check to CI ([#17092](https://github.com/MetaMask/metamask-extension/pull/17092))
-- feat(mme-17212): convert shared/module/string-utils.js -> Typescript ([#17320](https://github.com/MetaMask/metamask-extension/pull/17320))
-- Relocate conversion utils to shared/modules/conversion.utils.js ([#17319](https://github.com/MetaMask/metamask-extension/pull/17319))
-- Fix #17138 - Allow ActionMessage to be autohidden after a given number of milliseconds ([#17269](https://github.com/MetaMask/metamask-extension/pull/17269))
-- i18n: fix es privacy policy links ([#17315](https://github.com/MetaMask/metamask-extension/pull/17315))
-- fix script for linting changed files ([#17028](https://github.com/MetaMask/metamask-extension/pull/17028))
-- Convert shared/constants/hardware-wallets.js -> Typescript ([#17310](https://github.com/MetaMask/metamask-extension/pull/17310))
+- Add hardcoded list of human-readable snap names ([#17595](https://github.com/MetaMask/metamask-extension/pull/17595))
+- Add hardcoded list of human-readable snap derivation paths ([#17627](https://github.com/MetaMask/metamask-extension/pull/17627))
+- remove siwe feature flag ([#17690](https://github.com/MetaMask/metamask-extension/pull/17690))
+
+### Changed
 - TransactionDecoding: rm unwanted cursor: pointer ([#17318](https://github.com/MetaMask/metamask-extension/pull/17318))
-- Convert shared/constants/labels.js -> Typescript ([#17309](https://github.com/MetaMask/metamask-extension/pull/17309))
+- Fix #17138 - Allow ActionMessage to be autohidden after a given number of milliseconds ([#17269](https://github.com/MetaMask/metamask-extension/pull/17269))
+- chore: copy update for metamask fee on swaps ([#17133](https://github.com/MetaMask/metamask-extension/pull/17133))
+- Use PageContainerFooter to render footer on all confirmation pages ([#17316](https://github.com/MetaMask/metamask-extension/pull/17316))
+- Enable the Token Allowance flow by default for all users ([#16740](https://github.com/MetaMask/metamask-extension/pull/16740))
+- [FLASK] Update onboarding text to fit new panel ([#17345](https://github.com/MetaMask/metamask-extension/pull/17345))
+- Copy update on Transaction breakdown for ApproveToken ([#17296](https://github.com/MetaMask/metamask-extension/pull/17296))
+- [GridPlus] Bumps `gridplus-sdk` to v2.4.1 ([#16847](https://github.com/MetaMask/metamask-extension/pull/16847))
+- Update home portfolio dapp icon to new icon ([#17471](https://github.com/MetaMask/metamask-extension/pull/17471))
+- Update copy when revoking setApprovalForAll ([#17500](https://github.com/MetaMask/metamask-extension/pull/17500))
+- Fix #17441 - Update all MenuItem instances to use new icons ([#17468](https://github.com/MetaMask/metamask-extension/pull/17468))
+- New Icons: Replace instance of fa-qr-code icon ([#17474](https://github.com/MetaMask/metamask-extension/pull/17474))
+- Update overview icons for buy, send, and swap ([#17492](https://github.com/MetaMask/metamask-extension/pull/17492))
+- Adjust 'Confirm' button color on setApprovalForAll revocations ([#17506](https://github.com/MetaMask/metamask-extension/pull/17506))
+- updated tag icon ([#17540](https://github.com/MetaMask/metamask-extension/pull/17540))
+- UX: Update support icon ([#17560](https://github.com/MetaMask/metamask-extension/pull/17560))
+- fix: update ledger logo ([#17616](https://github.com/MetaMask/metamask-extension/pull/17616))
+- Sort permissions based on weight ([#17660](https://github.com/MetaMask/metamask-extension/pull/17660))
+- Sanitising string on signature request pages ([#17571](https://github.com/MetaMask/metamask-extension/pull/17571))
+- UX: Update block explorer icon ([#17562](https://github.com/MetaMask/metamask-extension/pull/17562))
+- Fix recent recipient order ([#16346](https://github.com/MetaMask/metamask-extension/pull/16346))
+- UX: Icons: Use proper send icon on wallet and token overview pages ([#17720](https://github.com/MetaMask/metamask-extension/pull/17720))
+- Do not display experiment settings tab when there are no settings to show ([#17765](https://github.com/MetaMask/metamask-extension/pull/17765))
+- UX: Icons: Stop using fa-address-book ([#17761](https://github.com/MetaMask/metamask-extension/pull/17761))
+- UX: Replace all fa-bell instances with Notification icon ([#17524](https://github.com/MetaMask/metamask-extension/pull/17524))
+- UX: Icons: Remove usage of chevron fa- icons ([#17668](https://github.com/MetaMask/metamask-extension/pull/17668))
+- UX: Icon: Restore missing back chevron in settings ([#17916](https://github.com/MetaMask/metamask-extension/pull/17916))
+- Update the PhishingController to v2 and update phishing warning page ([#17835](https://github.com/MetaMask/metamask-extension/pull/17835))
+
+### Removed
+- Remove a notification for falling back from STX to regular swaps ([#17374](https://github.com/MetaMask/metamask-extension/pull/17374))
+
+### Fixed
 - Fix transaction decoding data types `string` and `bool` ([#17299](https://github.com/MetaMask/metamask-extension/pull/17299))
+- i18n: fix es privacy policy links ([#17315](https://github.com/MetaMask/metamask-extension/pull/17315))
+- Added fix for overlaping text in mozzila in activity tab ([#17235](https://github.com/MetaMask/metamask-extension/pull/17235))
+- Restore support for Chromium v78 ([#17251](https://github.com/MetaMask/metamask-extension/pull/17251))
+- remove snap notifications when uninstalled ([#17487](https://github.com/MetaMask/metamask-extension/pull/17487))
+- Fix #17439 - Prevent event error when user presses enter key during onboarding ([#17497](https://github.com/MetaMask/metamask-extension/pull/17497))
+- Added navigation between multiple sign prompts and reject all sign prompts ([#17093](https://github.com/MetaMask/metamask-extension/pull/17093))
+- Fix RPC Url editing issue of existing network ([#17451](https://github.com/MetaMask/metamask-extension/pull/17451))
+- Fix http-cache-semantics dependency vulnerability GHSA-rc47-6667-2j5j ([#17563](https://github.com/MetaMask/metamask-extension/pull/17563))
+- UX: Fix token image not displaying in asset listing ([#17575](https://github.com/MetaMask/metamask-extension/pull/17575))
+- Fix for error during sending to multisig address ([#17651](https://github.com/MetaMask/metamask-extension/pull/17651))
+- Ensure simulation failure warning is shown on all networks and accounts ([#17458](https://github.com/MetaMask/metamask-extension/pull/17458))
+- Fix currency symbol in insufficient balance warning ([#17820](https://github.com/MetaMask/metamask-extension/pull/17820))
 
 ## [10.25.0]
 ### Added

From 8c550e78e9b79e3ce729865f9ab99cf3b24c0ff6 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Wed, 8 Mar 2023 09:38:24 -0800
Subject: [PATCH 27/36] patch lavamoat files to make v10.26.0 compatible with
 v78 of chrome (#18053)

Co-authored-by: Peter <53189696+PeterYinusa@users.noreply.github.com>
---
 .../@lavamoat-snow-npm-1.4.1-405a48e593.patch |  9 ++++
 .../lavamoat-core-npm-12.4.0-cecca1a9b5.patch | 14 ++++++
 .../lavamoat-core-npm-14.0.0-0f5bdac846.patch | 16 +++++++
 app/scripts/use-snow.js                       |  2 +-
 development/build/index.js                    |  1 +
 package.json                                  |  6 ++-
 yarn.lock                                     | 47 ++++++++++++++++---
 7 files changed, 86 insertions(+), 9 deletions(-)
 create mode 100644 .yarn/patches/@lavamoat-snow-npm-1.4.1-405a48e593.patch
 create mode 100644 .yarn/patches/lavamoat-core-npm-12.4.0-cecca1a9b5.patch
 create mode 100644 .yarn/patches/lavamoat-core-npm-14.0.0-0f5bdac846.patch

diff --git a/.yarn/patches/@lavamoat-snow-npm-1.4.1-405a48e593.patch b/.yarn/patches/@lavamoat-snow-npm-1.4.1-405a48e593.patch
new file mode 100644
index 000000000..634cda891
--- /dev/null
+++ b/.yarn/patches/@lavamoat-snow-npm-1.4.1-405a48e593.patch
@@ -0,0 +1,9 @@
+diff --git a/snow.prod.js b/snow.prod.js
+index 2887e42dced838685e5b8f76d2c2f953fb808200..7fdac0cb49b5653371cecc4e2655999ad183047b 100644
+--- a/snow.prod.js
++++ b/snow.prod.js
+@@ -1 +1 @@
+-(function(){"use strict";(()=>{var e={586:(e,t,n)=>{const r=n(228),{getFramesArray:o,getFrameTag:i}=n(648),{getOnload:c,setOnload:a,removeAttribute:s,addEventListener:u}=n(14);function l(e){if(!i(e))return;u(e,"load",(function(){r(e)}));const t=c(e);t&&(a(e,null),s(e,"onload"),a(e,t))}e.exports=function(e){for(let t=0;t<e.length;t++){const n=e[t],r=o(n,!0);for(let e=0;e<r.length;e++)l(r[e])}}},750:e=>{e.exports=function(e){e&&e.contentWindow}},832:(e,t,n)=>{const{Object:r,Function:o}=n(14),{isTagFramable:i}=n(648),{error:c,ERR_EXTENDING_FRAMABLES_BLOCKED:a}=n(312);e.exports=function(e){const t=r.getOwnPropertyDescriptor(e.CustomElementRegistry.prototype,"define");t.configurable=t.writable=!0;const n=t.value;var s;t.value=(s=n,function(e,t,n){let r=n;if(n){const t=n.extends;i(t+"")&&c(a,e,n)&&(r=void 0)}return o.prototype.call.call(s,this,e,t,r)}),r.defineProperty(e.CustomElementRegistry.prototype,"define",t)}},228:(e,t,n)=>{const r=n(851),o=n(750),{shadows:i,toArray:c,getFramesArray:a,getContentWindowOfFrame:s,getOwnerWindowOfNode:u}=n(648),{Object:l,getFrameElement:p}=n(14);function f(e,t){let n=-1;for(;e[++n];){if(r(e[n],e,l))continue;if(p(e[n])===t)return e[n];const o=f(e[n],t);if(o)return o}for(let n=0;n<i.length;n++){const r=i[n];if(u(r)!==e)continue;const o=a(r,!1);for(let e=0;e<o.length;e++){const n=o[e],r=s(n);if(n===t)return r;const i=f(r,t);if(i)return i}}return null}e.exports=function(e){e=c(e);for(let t=0;t<e.length;t++){const n=e[t];if("object"!=typeof n)continue;o(n);const r=f(top,n);r&&top.SNOW_WINDOW(r)}}},328:(e,t,n)=>{const{getFramesArray:r}=n(648),{Array:o,stringToLowerCase:i,split:c,getAttribute:a,setAttribute:s,getTemplateContent:u,getChildElementCount:l,createElement:p,getInnerHTML:f,setInnerHTML:m,remove:g,DocumentFragment:d}=n(14),{warn:y,WARN_DECLARATIVE_SHADOWS:w}=n(312),E=d.prototype.querySelectorAll;function O(e,t){let n="top."+(e?"SNOW_FRAME":"SNOW_WINDOW")+"(this);";return t&&(n="<script>"+n+"document.currentScript.remove();<\/script>"),n}function h(e){let t=a(e,"onload");return!!t&&(t=O(!0,!1)+t,s(e,"onload",t),!0)}function v(e){let t=a(e,"src")||"";const[n,r]=c(t,":");return"javascript"===i(n)&&(t="javascript:"+O(!1,!1)+r,s(e,"src",t),!0)}function D(e){let t=a(e,"srcdoc");if(t){t=O(!1,!0)+t;const n=new o(t);return _(n,!0),s(e,"srcdoc",n[0]),!0}return!1}function _(e,t){for(let i=0;i<e.length;i++){const c=p(document,"template");m(c,e[i]);const a=u(c);if(!l(a))continue;let s=!1;if(t){const e=p(document,"script");e.textContent=O(!1,!1),a.insertBefore(e,a.firstChild),s=!0}const d=E.call(a,"template[shadowroot]");for(let t=0;t<d.length;t++)n=d[t],o=e[i],y(w,n,o),g(n),s=!0;const _=r(a,!1);for(let e=0;e<_.length;e++){const t=_[e];s=h(t)||s,s=v(t)||s,s=D(t)||s}s&&(e[i]=f(c))}var n,o}e.exports={handleHTML:_}},352:(e,t,n)=>{const r=n(228),o=n(832),i=n(583),c=n(459),a=n(58),{hookShadowDOM:s}=n(373),{Object:u,addEventListener:l,getFrameElement:p}=n(14),{isMarked:f,mark:m}=n(111),{error:g,ERR_PROVIDED_CB_IS_NOT_A_FUNCTION:d,ERR_MARK_NEW_WINDOW_FAILED:y}=n(312);function w(e,t){const n=u.create(null);n.value=t,u.defineProperty(top,e,n)}function E(e){try{const t=!f(e);return t&&m(e),t}catch(t){g(y,e,t)}return E(e)}function O(e){E(e)&&(function(e){!function(e){const t=p(e);l(t,"load",(function(){r(t)}))}(e),o(e),i(e),c(e,"load"),a(e),s(e)}(e),h(e))}let h;e.exports=function(e,t){if(!h){if("function"!=typeof e&&g(d,e))return;w("SNOW_WINDOW",(function(e){O(e)})),w("SNOW_FRAME",(function(e){r(e)})),h=e}O(t||top)}},58:(e,t,n)=>{const{protectShadows:r}=n(373),o=n(586),{getFramesArray:i,shadows:c}=n(648),{getParentElement:a,slice:s,Object:u,Function:l}=n(14),{handleHTML:p}=n(328),f=n(228),m={DocumentFragment:["replaceChildren","append","prepend"],Document:["replaceChildren","append","prepend","write","writeln"],Node:["appendChild","insertBefore","replaceChild"],Element:["innerHTML","outerHTML","insertAdjacentHTML","replaceWith","insertAdjacentElement","append","before","prepend","after","replaceChildren"],ShadowRoot:["innerHTML"],HTMLIFrameElement:["srcdoc"]};function g(e,t){function n(e){o(e),o(c),p(e,t)}function u(e,t){const n=i(t,!1);f(n),f(e),r(!0)}return function(){const t=s(arguments),r=a(this)||this;n(t);const o=l.prototype.apply.call(e,this,t);return u(t,r),o}}e.exports=function(e){for(const t in m){const n=m[t];for(let r=0;r<n.length;r++){const o=n[r],i=u.getOwnPropertyDescriptor(e[t].prototype,o),c=i.set?"set":"value";i[c]=g(i[c],"srcdoc"===o),i.configurable=!0,"value"===c&&(i.writable=!0),u.defineProperty(e[t].prototype,o,i)}}}},459:(e,t,n)=>{const r=n(228),{removeEventListener:o,addEventListener:i,slice:c,Map:a,Object:s}=n(14),u=new a;function l(e,t,n){if(t)return t.handleEvent?t.handleEvent.apply(t,n):t.apply(e,n)}function p(e,t){return function(n,o,a){let s=o;return n===t&&(u.has(o)||u.set(o,(function(){r(this);const e=c(arguments);l(this,o,e)})),s=u.get(o)),i(this||e,n,s,a)}}function f(e,t){return function(n,r,i){let c=r;return n===t&&(c=u.get(r),u.delete(r)),o(this||e,n,c,i)}}e.exports=function(e,t){s.defineProperty(e.EventTarget.prototype,"addEventListener",{configurable:!0,writable:!0,value:p(e,t)}),s.defineProperty(e.EventTarget.prototype,"removeEventListener",{configurable:!0,writable:!0,value:f(e,t)})}},312:(e,t,n)=>{const{console:r}=n(14);e.exports={warn:function(e,t,n){let o;switch(e){case 5:const e=t,i=n;o=!1,r.warn("SNOW:","removing html string representing a declarative shadow:",e,"\n",`"${i}"`,".","\n","if this prevents your application from running correctly, please visit/report at","https://github.com/LavaMoat/snow/issues/32#issuecomment-1239273328",".");break;case 3:const c=t,a=n;o=!0,r.warn("SNOW:",o?"":"NOT",'blocking open attempt to "javascript:" url:',c,"by window: ",a,".","\n","if this prevents your application from running correctly, please visit/report at","https://github.com/LavaMoat/snow/issues/44#issuecomment-1369687802",".");break;case 2:const s=t,u=n;o=!0,r.warn("SNOW:","blocking access to property:",`"${s}"`,"of opened window: ",u,".","\n","if this prevents your application from running correctly, please visit/report at","https://github.com/LavaMoat/snow/issues/2#issuecomment-1239264255",".")}return o},error:function(e,t,n){let o;switch(e){case 6:const e=t,i=n;o=!0,r.error("SNOW:",`"${e}"`,"extending attempt","of framable elements such as provided",i,"is blocked to prevent bypass",".","\n","if this prevents your application from running correctly, please visit/report at","https://github.com/LavaMoat/snow/issues/56#issuecomment-1374899809",".","\n");break;case 1:const c=t,a=n;o=!0,r.error("SNOW:","failed to mark new window:",c,".","\n","if this prevents your application from running correctly, please visit/report at","https://github.com/LavaMoat/snow/issues/33#issuecomment-1239280063",".","\n","in order to maintain a bulletproof defense mechanism, failing to mark a new window typically causes an infinite loop",".","\n","error caught:","\n",a);break;case 4:const s=t;o=!0,r.error("SNOW:",'first argument must be of type "function", instead got:',s,".","\n","therefore, snow bailed and is not applied to the page until this is fixed.")}return o},ERR_MARK_NEW_WINDOW_FAILED:1,WARN_OPEN_API_LIMITED:2,WARN_OPEN_API_URL_ARG_JAVASCRIPT_SCHEME:3,ERR_PROVIDED_CB_IS_NOT_A_FUNCTION:4,WARN_DECLARATIVE_SHADOWS:5,ERR_EXTENDING_FRAMABLES_BLOCKED:6}},111:(e,t,n)=>{const{Map:r,Object:o,Array:i}=n(14),c=new i,a=new r;e.exports={isMarked:function(e){if(!a.has(e))return!1;const t=o.getOwnPropertyDescriptor(e,"SNOW_ID");if(!t||!o.hasOwnProperty.call(t,"value"))return!1;if("function"!=typeof t.value)return!1;const n=a.get(e);return t.value(c)===n},mark:function(e){const t=new i,n=o.create(null);n.value=e=>e===c&&t,o.defineProperty(e,"SNOW_ID",n),a.set(e,t)}}},14:e=>{e.exports=function(e){const t=function(e){const{EventTarget:t}=e;return function(e,n){const r=e.document.createElement("iframe");(e.document.head||e.document.documentElement).appendChild(r);const o=function(e){const{console:n,Proxy:r,JSON:o,Attr:i,String:c,Function:a,Map:s,Node:u,Document:l,DocumentFragment:p,ShadowRoot:f,Object:m,Reflect:g,Array:d,Element:y,HTMLElement:w,HTMLTemplateElement:E,HTMLIFrameElement:O,HTMLFrameElement:h,HTMLObjectElement:v}=e,D={console:n,Proxy:r,JSON:o,Attr:i,String:c,Function:a,Map:s,Node:u,Document:l,DocumentFragment:p,ShadowRoot:f,Object:m,Reflect:g,Array:d,Element:y,HTMLElement:w,HTMLTemplateElement:E,EventTarget:t,HTMLIFrameElement:O,HTMLFrameElement:h,HTMLObjectElement:v};return D.document={createElement:e.document.createElement},D}(r.contentWindow);return r.parentElement.removeChild(r),o}(e)}(e),{console:n,Proxy:r,Function:o,String:i,Map:c,Node:a,Document:s,DocumentFragment:u,ShadowRoot:l,Object:p,Reflect:f,Array:m,Element:g,HTMLElement:d,HTMLTemplateElement:y,EventTarget:w,HTMLIFrameElement:E,HTMLFrameElement:O,HTMLObjectElement:h}=t;return p.assign(t,{iframeContentWindow:p.getOwnPropertyDescriptor(E.prototype,"contentWindow").get,frameContentWindow:p.getOwnPropertyDescriptor(O.prototype,"contentWindow").get,objectContentWindow:p.getOwnPropertyDescriptor(h.prototype,"contentWindow").get,createElement:p.getOwnPropertyDescriptor(s.prototype,"createElement").value,slice:p.getOwnPropertyDescriptor(m.prototype,"slice").value,split:p.getOwnPropertyDescriptor(i.prototype,"split").value,nodeType:p.getOwnPropertyDescriptor(a.prototype,"nodeType").get,tagName:p.getOwnPropertyDescriptor(g.prototype,"tagName").get,getInnerHTML:p.getOwnPropertyDescriptor(g.prototype,"innerHTML").get,setInnerHTML:p.getOwnPropertyDescriptor(g.prototype,"innerHTML").set,toString:p.getOwnPropertyDescriptor(p.prototype,"toString").value,getOnload:p.getOwnPropertyDescriptor(d.prototype,"onload").get,setOnload:p.getOwnPropertyDescriptor(d.prototype,"onload").set,getAttribute:p.getOwnPropertyDescriptor(g.prototype,"getAttribute").value,setAttribute:p.getOwnPropertyDescriptor(g.prototype,"setAttribute").value,removeAttribute:p.getOwnPropertyDescriptor(g.prototype,"removeAttribute").value,remove:p.getOwnPropertyDescriptor(g.prototype,"remove").value,addEventListener:p.getOwnPropertyDescriptor(w.prototype,"addEventListener").value,removeEventListener:p.getOwnPropertyDescriptor(w.prototype,"removeEventListener").value,getTemplateContent:p.getOwnPropertyDescriptor(y.prototype,"content").get,getChildElementCount:p.getOwnPropertyDescriptor(u.prototype,"childElementCount").get,getFrameElement:p.getOwnPropertyDescriptor(e,"frameElement").get,getParentElement:p.getOwnPropertyDescriptor(a.prototype,"parentElement").get,getOwnerDocument:p.getOwnPropertyDescriptor(a.prototype,"ownerDocument").get,getDefaultView:p.getOwnPropertyDescriptor(s.prototype,"defaultView").get}),{console:n,Proxy:r,Object:p,Reflect:f,Function:o,Node:a,Element:g,Document:s,DocumentFragment:u,ShadowRoot:l,Array:m,Map:c,getContentWindow:function(e,n){switch(n){case"IFRAME":return t.iframeContentWindow.call(e);case"FRAME":return t.frameContentWindow.call(e);case"OBJECT":return t.objectContentWindow.call(e);default:return null}},stringToLowerCase:function(e){return t.String.prototype.toLowerCase.call(e)},stringStartsWith:function(e,n){return t.String.prototype.startsWith.call(e,n)},parse:function(e,n){return t.JSON.parse(e,n)},stringify:function(e,n,r){return t.JSON.stringify(e,n,r)},slice:function(e,n,r){return t.slice.call(e,n,r)},split:function(e,n){return t.split.call(e,n)},nodeType:function(e){return t.nodeType.call(e)},tagName:function(e){return t.tagName.call(e)},toString:function(e){return t.toString.call(e)},getOnload:function(e){return t.getOnload.call(e)},setOnload:function(e,n){return t.setOnload.call(e,n)},remove:function(e){return t.remove.call(e)},removeAttribute:function(e,n){return t.removeAttribute.call(e,n)},getAttribute:function(e,n){return t.getAttribute.call(e,n)},setAttribute:function(e,n,r){return t.setAttribute.call(e,n,r)},addEventListener:function(e,n,r,o){return t.addEventListener.call(e,n,r,o)},removeEventListener:function(e,n,r,o){return t.removeEventListener.call(e,n,r,o)},createElement:function(e,n,r){return t.createElement.call(e,n,r)},getInnerHTML:function(e){return t.getInnerHTML.call(e)},setInnerHTML:function(e,n){return t.setInnerHTML.call(e,n)},getTemplateContent:function(e){return t.getTemplateContent.call(e)},getChildElementCount:function(e){return t.getChildElementCount.call(e)},getFrameElement:function(e){return t.Function.prototype.call.call(t.getFrameElement,e)},getParentElement:function(e){return t.getParentElement.call(e)},getOwnerDocument:function(e){return t.getOwnerDocument.call(e)},getDefaultView:function(e){return t.getDefaultView.call(e)}}}(top)},583:(e,t,n)=>{const{stringToLowerCase:r,stringStartsWith:o,slice:i,Function:c,Object:a,Reflect:s,Proxy:u,Map:l}=n(14),{warn:p,WARN_OPEN_API_LIMITED:f,WARN_OPEN_API_URL_ARG_JAVASCRIPT_SCHEME:m}=n(312),g=new l;function d(e,t){const n=new a(null);return a.defineProperty(n,"closed",{get:function(){return t.closed}}),a.defineProperty(n,"close",{value:function(){return t.close()}}),a.defineProperty(n,"focus",{value:function(){return t.focus()}}),a.defineProperty(n,"postMessage",{value:function(e,n,r){return t.postMessage(e,n,r)}}),new u(n,{get:function(n,r){let o=s.get(n,r);return s.has(n,r)||s.has(t,r)&&(p(f,r,e)||(o=s.get(t,r))),o},set:function(){}})}e.exports=function(e){!function(e){const t=a.getOwnPropertyDescriptor(e.MessageEvent.prototype,"source"),n=t.get;t.get=function(){const e=n.call(this);return g.get(e)||e},a.defineProperty(e.MessageEvent.prototype,"source",t)}(e),e.open=function(e,t){return function(){const n=i(arguments),a=n[0]+"",s=n[1],u=n[2];if(o(r(a),"javascript")&&p(m,a,e))return null;const l=c.prototype.call.call(t,this,a,s,u);if(!l)return null;top.SNOW_WINDOW(l);const f=d(e,l);return g.set(l,f),f}}(e,e.open)}},373:(e,t,n)=>{const r=n(228),{getFramesArray:o,shadows:i}=n(648),{Object:c,Function:a}=n(14);function s(e){for(let t=0;t<i.length;t++){const n=i[t];if(e&&!n.isConnected)continue;const c=o(n,!1);r(c)}}e.exports={hookShadowDOM:function(e){const t=c.getOwnPropertyDescriptor(e.Element.prototype,"attachShadow");t.configurable=t.writable=!0;const n=t.value;var r;t.value=(r=n,function(e){const t=a.prototype.call.call(r,this,e);return i.push(t),s(!0),t}),c.defineProperty(e.Element.prototype,"attachShadow",t)},protectShadows:s}},648:(e,t,n)=>{const{tagName:r,nodeType:o,slice:i,Array:c,parse:a,stringify:s,Node:u,Document:l,DocumentFragment:p,Element:f,ShadowRoot:m,getContentWindow:g,getDefaultView:d,getOwnerDocument:y,stringToLowerCase:w}=n(14),E=new c;function O(e){return E.includes(e)}function h(e){const t=w(e);return"iframe"===t||"frame"===t||"object"===t||"embed"===t}function v(e){if(!e||"object"!=typeof e)return null;if(o(e)!==f.prototype.ELEMENT_NODE)return null;if(O(e))return null;const t=r(e);return h(t)?t:null}function D(e){return c.isArray(e)||(e=new c(e)),e}function _(e,t){let n=!1;for(let r=0;r<t.length;r++)e.includes(t[r])||(e.push(t[r]),n=!0);return n}e.exports={toArray:D,isTagFramable:h,getOwnerWindowOfNode:function(e){return d(y(e))},getContentWindowOfFrame:function(e){return g(e,v(e))},getFramesArray:function(e,t){const n=new c;if(null===e||"object"!=typeof e)return n;if("string"==typeof a(s(r=e,((e,t)=>e||r!==t?"":t)))||!function(e){if(O(e))return!0;const t=o(e);return t===f.prototype.ELEMENT_NODE||t===f.prototype.DOCUMENT_FRAGMENT_NODE||t===f.prototype.DOCUMENT_NODE}(e))return n;var r;const g=function(e){if(O(e))return m;switch(o(e)){case u.prototype.DOCUMENT_NODE:return l;case u.prototype.DOCUMENT_FRAGMENT_NODE:return p;default:return f}}(e).prototype.querySelectorAll.call(e,"iframe,frame,object,embed");return _(n,i(g)),t&&_(n,D(e)),n},getFrameTag:v,shadows:E}},626:e=>{e.exports={SRC_IS_NOT_A_WINDOW:'provided argument "src" must be a proper window of instance Window',DST_IS_NOT_A_WINDOW:'provided argument "dst" must be a proper window of instance Window',SRC_IS_NOT_SAME_ORIGIN_AS_WINDOW:'provided argument "src" must be a window in the same origin as the current context window'}},851:(e,t,n)=>{const{DST_IS_NOT_A_WINDOW:r,SRC_IS_NOT_A_WINDOW:o,SRC_IS_NOT_SAME_ORIGIN_AS_WINDOW:i}=n(626);function c(e,t){const n=t(e);return n===n.window}function a(e,t,n){return null===n.getPrototypeOf.call(t,e)}e.exports=function(e,t=window,n=window.Object){if(!c(t,n))throw new Error(o);if(!c(e,n))throw new Error(r);if(a(window,t,n))throw new Error(i);return a(e,t,n)}}},t={};function n(r){var o=t[r];if(void 0!==o)return o.exports;var i=t[r]={exports:{}};return e[r](i,i.exports,n),i.exports}n.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return n.d(t,{a:t}),t},n.d=(e,t)=>{for(var r in t)n.o(t,r)&&!n.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},n.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{"use strict";var e,t=n(352),r=n.n(t);e=top,Object.defineProperty(e,"SNOW",{value:r()})})()})();}())
+\ No newline at end of file
++(function(){"use strict";(()=>{var e={586:(e,t,n)=>{const r=n(228),{getFramesArray:o,getFrameTag:i}=n(648),{getOnload:c,setOnload:a,removeAttribute:s,addEventListener:u}=n(14);function l(e){if(!i(e))return;u(e,"load",(function(){r(e)}));const t=c(e);t&&(a(e,null),s(e,"onload"),a(e,t))}e.exports=function(e){for(let t=0;t<e.length;t++){const n=e[t],r=o(n,!0);for(let e=0;e<r.length;e++)l(r[e])}}},750:e=>{e.exports=function(e){e&&e.contentWindow}},832:(e,t,n)=>{const{Object:r,Function:o}=n(14),{isTagFramable:i}=n(648),{error:c,ERR_EXTENDING_FRAMABLES_BLOCKED:a}=n(312);e.exports=function(e){const t=r.getOwnPropertyDescriptor(e.CustomElementRegistry.prototype,"define");t.configurable=t.writable=!0;const n=t.value;var s;t.value=(s=n,function(e,t,n){let r=n;if(n){const t=n.extends;i(t+"")&&c(a,e,n)&&(r=void 0)}return o.prototype.call.call(s,this,e,t,r)}),r.defineProperty(e.CustomElementRegistry.prototype,"define",t)}},228:(e,t,n)=>{const r=n(851),o=n(750),{shadows:i,toArray:c,getFramesArray:a,getContentWindowOfFrame:s,getOwnerWindowOfNode:u}=n(648),{Object:l,getFrameElement:p}=n(14);function f(e,t){let n=-1;for(;e[++n];){if(r(e[n],e,l))continue;if(p(e[n])===t)return e[n];const o=f(e[n],t);if(o)return o}for(let n=0;n<i.length;n++){const r=i[n];if(u(r)!==e)continue;const o=a(r,!1);for(let e=0;e<o.length;e++){const n=o[e],r=s(n);if(n===t)return r;const i=f(r,t);if(i)return i}}return null}e.exports=function(e){e=c(e);for(let t=0;t<e.length;t++){const n=e[t];if("object"!=typeof n)continue;o(n);const r=f(top,n);r&&top.SNOW_WINDOW(r)}}},328:(e,t,n)=>{const{getFramesArray:r}=n(648),{Array:o,stringToLowerCase:i,split:c,getAttribute:a,setAttribute:s,getTemplateContent:u,getChildElementCount:l,createElement:p,getInnerHTML:f,setInnerHTML:m,remove:g,DocumentFragment:d}=n(14),{warn:y,WARN_DECLARATIVE_SHADOWS:w}=n(312),E=d.prototype.querySelectorAll;function O(e,t){let n="top."+(e?"SNOW_FRAME":"SNOW_WINDOW")+"(this);";return t&&(n="<script>"+n+"document.currentScript.remove();<\/script>"),n}function h(e){let t=a(e,"onload");return!!t&&(t=O(!0,!1)+t,s(e,"onload",t),!0)}function v(e){let t=a(e,"src")||"";const[n,r]=c(t,":");return"javascript"===i(n)&&(t="javascript:"+O(!1,!1)+r,s(e,"src",t),!0)}function D(e){let t=a(e,"srcdoc");if(t){t=O(!1,!0)+t;const n=new o(t);return _(n,!0),s(e,"srcdoc",n[0]),!0}return!1}function _(e,t){for(let i=0;i<e.length;i++){const c=p(document,"template");m(c,e[i]);const a=u(c);if(!l(a))continue;let s=!1;if(t){const e=p(document,"script");e.textContent=O(!1,!1),a.insertBefore(e,a.firstChild),s=!0}const d=E.call(a,"template[shadowroot]");for(let t=0;t<d.length;t++)n=d[t],o=e[i],y(w,n,o),g(n),s=!0;const _=r(a,!1);for(let e=0;e<_.length;e++){const t=_[e];s=h(t)||s,s=v(t)||s,s=D(t)||s}s&&(e[i]=f(c))}var n,o}e.exports={handleHTML:_}},352:(e,t,n)=>{const r=n(228),o=n(832),i=n(583),c=n(459),a=n(58),{hookShadowDOM:s}=n(373),{Object:u,addEventListener:l,getFrameElement:p}=n(14),{isMarked:f,mark:m}=n(111),{error:g,ERR_PROVIDED_CB_IS_NOT_A_FUNCTION:d,ERR_MARK_NEW_WINDOW_FAILED:y}=n(312);function w(e,t){const n=u.create(null);n.value=t,u.defineProperty(top,e,n)}function E(e){try{const t=!f(e);return t&&m(e),t}catch(t){g(y,e,t)}return E(e)}function O(e){E(e)&&(function(e){!function(e){const t=p(e);l(t,"load",(function(){r(t)}))}(e),o(e),i(e),c(e,"load"),a(e),s(e)}(e),h(e))}let h;e.exports=function(e,t){if(!h){if("function"!=typeof e&&g(d,e))return;w("SNOW_WINDOW",(function(e){O(e)})),w("SNOW_FRAME",(function(e){r(e)})),h=e}O(t||top)}},58:(e,t,n)=>{const{protectShadows:r}=n(373),o=n(586),{getFramesArray:i,shadows:c}=n(648),{getParentElement:a,slice:s,Object:u,Function:l}=n(14),{handleHTML:p}=n(328),f=n(228),m={DocumentFragment:["append","prepend"],Document:["append","prepend","write","writeln"],Node:["appendChild","insertBefore","replaceChild"],Element:["innerHTML","outerHTML","insertAdjacentHTML","replaceWith","insertAdjacentElement","append","before","prepend","after"],ShadowRoot:["innerHTML"],HTMLIFrameElement:["srcdoc"]};function g(e,t){function n(e){o(e),o(c),p(e,t)}function u(e,t){const n=i(t,!1);f(n),f(e),r(!0)}return function(){const t=s(arguments),r=a(this)||this;n(t);const o=l.prototype.apply.call(e,this,t);return u(t,r),o}}e.exports=function(e){for(const t in m){const n=m[t];for(let r=0;r<n.length;r++){const o=n[r],i=u.getOwnPropertyDescriptor(e[t].prototype,o),c=i.set?"set":"value";i[c]=g(i[c],"srcdoc"===o),i.configurable=!0,"value"===c&&(i.writable=!0),u.defineProperty(e[t].prototype,o,i)}}}},459:(e,t,n)=>{const r=n(228),{removeEventListener:o,addEventListener:i,slice:c,Map:a,Object:s}=n(14),u=new a;function l(e,t,n){if(t)return t.handleEvent?t.handleEvent.apply(t,n):t.apply(e,n)}function p(e,t){return function(n,o,a){let s=o;return n===t&&(u.has(o)||u.set(o,(function(){r(this);const e=c(arguments);l(this,o,e)})),s=u.get(o)),i(this||e,n,s,a)}}function f(e,t){return function(n,r,i){let c=r;return n===t&&(c=u.get(r),u.delete(r)),o(this||e,n,c,i)}}e.exports=function(e,t){s.defineProperty(e.EventTarget.prototype,"addEventListener",{configurable:!0,writable:!0,value:p(e,t)}),s.defineProperty(e.EventTarget.prototype,"removeEventListener",{configurable:!0,writable:!0,value:f(e,t)})}},312:(e,t,n)=>{const{console:r}=n(14);e.exports={warn:function(e,t,n){let o;switch(e){case 5:const e=t,i=n;o=!1,r.warn("SNOW:","removing html string representing a declarative shadow:",e,"\n",`"${i}"`,".","\n","if this prevents your application from running correctly, please visit/report at","https://github.com/LavaMoat/snow/issues/32#issuecomment-1239273328",".");break;case 3:const c=t,a=n;o=!0,r.warn("SNOW:",o?"":"NOT",'blocking open attempt to "javascript:" url:',c,"by window: ",a,".","\n","if this prevents your application from running correctly, please visit/report at","https://github.com/LavaMoat/snow/issues/44#issuecomment-1369687802",".");break;case 2:const s=t,u=n;o=!0,r.warn("SNOW:","blocking access to property:",`"${s}"`,"of opened window: ",u,".","\n","if this prevents your application from running correctly, please visit/report at","https://github.com/LavaMoat/snow/issues/2#issuecomment-1239264255",".")}return o},error:function(e,t,n){let o;switch(e){case 6:const e=t,i=n;o=!0,r.error("SNOW:",`"${e}"`,"extending attempt","of framable elements such as provided",i,"is blocked to prevent bypass",".","\n","if this prevents your application from running correctly, please visit/report at","https://github.com/LavaMoat/snow/issues/56#issuecomment-1374899809",".","\n");break;case 1:const c=t,a=n;o=!0,r.error("SNOW:","failed to mark new window:",c,".","\n","if this prevents your application from running correctly, please visit/report at","https://github.com/LavaMoat/snow/issues/33#issuecomment-1239280063",".","\n","in order to maintain a bulletproof defense mechanism, failing to mark a new window typically causes an infinite loop",".","\n","error caught:","\n",a);break;case 4:const s=t;o=!0,r.error("SNOW:",'first argument must be of type "function", instead got:',s,".","\n","therefore, snow bailed and is not applied to the page until this is fixed.")}return o},ERR_MARK_NEW_WINDOW_FAILED:1,WARN_OPEN_API_LIMITED:2,WARN_OPEN_API_URL_ARG_JAVASCRIPT_SCHEME:3,ERR_PROVIDED_CB_IS_NOT_A_FUNCTION:4,WARN_DECLARATIVE_SHADOWS:5,ERR_EXTENDING_FRAMABLES_BLOCKED:6}},111:(e,t,n)=>{const{Map:r,Object:o,Array:i}=n(14),c=new i,a=new r;e.exports={isMarked:function(e){if(!a.has(e))return!1;const t=o.getOwnPropertyDescriptor(e,"SNOW_ID");if(!t||!o.hasOwnProperty.call(t,"value"))return!1;if("function"!=typeof t.value)return!1;const n=a.get(e);return t.value(c)===n},mark:function(e){const t=new i,n=o.create(null);n.value=e=>e===c&&t,o.defineProperty(e,"SNOW_ID",n),a.set(e,t)}}},14:e=>{e.exports=function(e){const t=function(e){const{EventTarget:t}=e;return function(e,n){const r=e.document.createElement("iframe");(e.document.head||e.document.documentElement).appendChild(r);const o=function(e){const{console:n,Proxy:r,JSON:o,Attr:i,String:c,Function:a,Map:s,Node:u,Document:l,DocumentFragment:p,ShadowRoot:f,Object:m,Reflect:g,Array:d,Element:y,HTMLElement:w,HTMLTemplateElement:E,HTMLIFrameElement:O,HTMLFrameElement:h,HTMLObjectElement:v}=e,D={console:n,Proxy:r,JSON:o,Attr:i,String:c,Function:a,Map:s,Node:u,Document:l,DocumentFragment:p,ShadowRoot:f,Object:m,Reflect:g,Array:d,Element:y,HTMLElement:w,HTMLTemplateElement:E,EventTarget:t,HTMLIFrameElement:O,HTMLFrameElement:h,HTMLObjectElement:v};return D.document={createElement:e.document.createElement},D}(r.contentWindow);return r.parentElement.removeChild(r),o}(e)}(e),{console:n,Proxy:r,Function:o,String:i,Map:c,Node:a,Document:s,DocumentFragment:u,ShadowRoot:l,Object:p,Reflect:f,Array:m,Element:g,HTMLElement:d,HTMLTemplateElement:y,EventTarget:w,HTMLIFrameElement:E,HTMLFrameElement:O,HTMLObjectElement:h}=t;return p.assign(t,{iframeContentWindow:p.getOwnPropertyDescriptor(E.prototype,"contentWindow").get,frameContentWindow:p.getOwnPropertyDescriptor(O.prototype,"contentWindow").get,objectContentWindow:p.getOwnPropertyDescriptor(h.prototype,"contentWindow").get,createElement:p.getOwnPropertyDescriptor(s.prototype,"createElement").value,slice:p.getOwnPropertyDescriptor(m.prototype,"slice").value,split:p.getOwnPropertyDescriptor(i.prototype,"split").value,nodeType:p.getOwnPropertyDescriptor(a.prototype,"nodeType").get,tagName:p.getOwnPropertyDescriptor(g.prototype,"tagName").get,getInnerHTML:p.getOwnPropertyDescriptor(g.prototype,"innerHTML").get,setInnerHTML:p.getOwnPropertyDescriptor(g.prototype,"innerHTML").set,toString:p.getOwnPropertyDescriptor(p.prototype,"toString").value,getOnload:p.getOwnPropertyDescriptor(d.prototype,"onload").get,setOnload:p.getOwnPropertyDescriptor(d.prototype,"onload").set,getAttribute:p.getOwnPropertyDescriptor(g.prototype,"getAttribute").value,setAttribute:p.getOwnPropertyDescriptor(g.prototype,"setAttribute").value,removeAttribute:p.getOwnPropertyDescriptor(g.prototype,"removeAttribute").value,remove:p.getOwnPropertyDescriptor(g.prototype,"remove").value,addEventListener:p.getOwnPropertyDescriptor(w.prototype,"addEventListener").value,removeEventListener:p.getOwnPropertyDescriptor(w.prototype,"removeEventListener").value,getTemplateContent:p.getOwnPropertyDescriptor(y.prototype,"content").get,getChildElementCount:p.getOwnPropertyDescriptor(u.prototype,"childElementCount").get,getFrameElement:p.getOwnPropertyDescriptor(e,"frameElement").get,getParentElement:p.getOwnPropertyDescriptor(a.prototype,"parentElement").get,getOwnerDocument:p.getOwnPropertyDescriptor(a.prototype,"ownerDocument").get,getDefaultView:p.getOwnPropertyDescriptor(s.prototype,"defaultView").get}),{console:n,Proxy:r,Object:p,Reflect:f,Function:o,Node:a,Element:g,Document:s,DocumentFragment:u,ShadowRoot:l,Array:m,Map:c,getContentWindow:function(e,n){switch(n){case"IFRAME":return t.iframeContentWindow.call(e);case"FRAME":return t.frameContentWindow.call(e);case"OBJECT":return t.objectContentWindow.call(e);default:return null}},stringToLowerCase:function(e){return t.String.prototype.toLowerCase.call(e)},stringStartsWith:function(e,n){return t.String.prototype.startsWith.call(e,n)},parse:function(e,n){return t.JSON.parse(e,n)},stringify:function(e,n,r){return t.JSON.stringify(e,n,r)},slice:function(e,n,r){return t.slice.call(e,n,r)},split:function(e,n){return t.split.call(e,n)},nodeType:function(e){return t.nodeType.call(e)},tagName:function(e){return t.tagName.call(e)},toString:function(e){return t.toString.call(e)},getOnload:function(e){return t.getOnload.call(e)},setOnload:function(e,n){return t.setOnload.call(e,n)},remove:function(e){return t.remove.call(e)},removeAttribute:function(e,n){return t.removeAttribute.call(e,n)},getAttribute:function(e,n){return t.getAttribute.call(e,n)},setAttribute:function(e,n,r){return t.setAttribute.call(e,n,r)},addEventListener:function(e,n,r,o){return t.addEventListener.call(e,n,r,o)},removeEventListener:function(e,n,r,o){return t.removeEventListener.call(e,n,r,o)},createElement:function(e,n,r){return t.createElement.call(e,n,r)},getInnerHTML:function(e){return t.getInnerHTML.call(e)},setInnerHTML:function(e,n){return t.setInnerHTML.call(e,n)},getTemplateContent:function(e){return t.getTemplateContent.call(e)},getChildElementCount:function(e){return t.getChildElementCount.call(e)},getFrameElement:function(e){return t.Function.prototype.call.call(t.getFrameElement,e)},getParentElement:function(e){return t.getParentElement.call(e)},getOwnerDocument:function(e){return t.getOwnerDocument.call(e)},getDefaultView:function(e){return t.getDefaultView.call(e)}}}(top)},583:(e,t,n)=>{const{stringToLowerCase:r,stringStartsWith:o,slice:i,Function:c,Object:a,Reflect:s,Proxy:u,Map:l}=n(14),{warn:p,WARN_OPEN_API_LIMITED:f,WARN_OPEN_API_URL_ARG_JAVASCRIPT_SCHEME:m}=n(312),g=new l;function d(e,t){const n=new a(null);return a.defineProperty(n,"closed",{get:function(){return t.closed}}),a.defineProperty(n,"close",{value:function(){return t.close()}}),a.defineProperty(n,"focus",{value:function(){return t.focus()}}),a.defineProperty(n,"postMessage",{value:function(e,n,r){return t.postMessage(e,n,r)}}),new u(n,{get:function(n,r){let o=s.get(n,r);return s.has(n,r)||s.has(t,r)&&(p(f,r,e)||(o=s.get(t,r))),o},set:function(){}})}e.exports=function(e){!function(e){const t=a.getOwnPropertyDescriptor(e.MessageEvent.prototype,"source"),n=t.get;t.get=function(){const e=n.call(this);return g.get(e)||e},a.defineProperty(e.MessageEvent.prototype,"source",t)}(e),e.open=function(e,t){return function(){const n=i(arguments),a=n[0]+"",s=n[1],u=n[2];if(o(r(a),"javascript")&&p(m,a,e))return null;const l=c.prototype.call.call(t,this,a,s,u);if(!l)return null;top.SNOW_WINDOW(l);const f=d(e,l);return g.set(l,f),f}}(e,e.open)}},373:(e,t,n)=>{const r=n(228),{getFramesArray:o,shadows:i}=n(648),{Object:c,Function:a}=n(14);function s(e){for(let t=0;t<i.length;t++){const n=i[t];if(e&&!n.isConnected)continue;const c=o(n,!1);r(c)}}e.exports={hookShadowDOM:function(e){const t=c.getOwnPropertyDescriptor(e.Element.prototype,"attachShadow");t.configurable=t.writable=!0;const n=t.value;var r;t.value=(r=n,function(e){const t=a.prototype.call.call(r,this,e);return i.push(t),s(!0),t}),c.defineProperty(e.Element.prototype,"attachShadow",t)},protectShadows:s}},648:(e,t,n)=>{const{tagName:r,nodeType:o,slice:i,Array:c,parse:a,stringify:s,Node:u,Document:l,DocumentFragment:p,Element:f,ShadowRoot:m,getContentWindow:g,getDefaultView:d,getOwnerDocument:y,stringToLowerCase:w}=n(14),E=new c;function O(e){return E.includes(e)}function h(e){const t=w(e);return"iframe"===t||"frame"===t||"object"===t||"embed"===t}function v(e){if(!e||"object"!=typeof e)return null;if(o(e)!==f.prototype.ELEMENT_NODE)return null;if(O(e))return null;const t=r(e);return h(t)?t:null}function D(e){return c.isArray(e)||(e=new c(e)),e}function _(e,t){let n=!1;for(let r=0;r<t.length;r++)e.includes(t[r])||(e.push(t[r]),n=!0);return n}e.exports={toArray:D,isTagFramable:h,getOwnerWindowOfNode:function(e){return d(y(e))},getContentWindowOfFrame:function(e){return g(e,v(e))},getFramesArray:function(e,t){const n=new c;if(null===e||"object"!=typeof e)return n;if("string"==typeof a(s(r=e,((e,t)=>e||r!==t?"":t)))||!function(e){if(O(e))return!0;const t=o(e);return t===f.prototype.ELEMENT_NODE||t===f.prototype.DOCUMENT_FRAGMENT_NODE||t===f.prototype.DOCUMENT_NODE}(e))return n;var r;const g=function(e){if(O(e))return m;switch(o(e)){case u.prototype.DOCUMENT_NODE:return l;case u.prototype.DOCUMENT_FRAGMENT_NODE:return p;default:return f}}(e).prototype.querySelectorAll.call(e,"iframe,frame,object,embed");return _(n,i(g)),t&&_(n,D(e)),n},getFrameTag:v,shadows:E}},626:e=>{e.exports={SRC_IS_NOT_A_WINDOW:'provided argument "src" must be a proper window of instance Window',DST_IS_NOT_A_WINDOW:'provided argument "dst" must be a proper window of instance Window',SRC_IS_NOT_SAME_ORIGIN_AS_WINDOW:'provided argument "src" must be a window in the same origin as the current context window'}},851:(e,t,n)=>{const{DST_IS_NOT_A_WINDOW:r,SRC_IS_NOT_A_WINDOW:o,SRC_IS_NOT_SAME_ORIGIN_AS_WINDOW:i}=n(626);function c(e,t){const n=t(e);return n===n.window}function a(e,t,n){return null===n.getPrototypeOf.call(t,e)}e.exports=function(e,t=window,n=window.Object){if(!c(t,n))throw new Error(o);if(!c(e,n))throw new Error(r);if(a(window,t,n))throw new Error(i);return a(e,t,n)}}},t={};function n(r){var o=t[r];if(void 0!==o)return o.exports;var i=t[r]={exports:{}};return e[r](i,i.exports,n),i.exports}n.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return n.d(t,{a:t}),t},n.d=(e,t)=>{for(var r in t)n.o(t,r)&&!n.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},n.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{"use strict";var e,t=n(352),r=n.n(t);e=top,Object.defineProperty(e,"SNOW",{value:r()})})()})();}())
+\ No newline at end of file
diff --git a/.yarn/patches/lavamoat-core-npm-12.4.0-cecca1a9b5.patch b/.yarn/patches/lavamoat-core-npm-12.4.0-cecca1a9b5.patch
new file mode 100644
index 000000000..cbd8e71d6
--- /dev/null
+++ b/.yarn/patches/lavamoat-core-npm-12.4.0-cecca1a9b5.patch
@@ -0,0 +1,14 @@
+diff --git a/src/kernelCoreTemplate.js b/src/kernelCoreTemplate.js
+index 255b2637167de9e5da435fe2f7ea364cfb22f86b..c229f5067a64d0a2705fa2f07085b6cac42bca9c 100644
+--- a/src/kernelCoreTemplate.js
++++ b/src/kernelCoreTemplate.js
+@@ -124,7 +124,8 @@
+         if (shouldAvoidProp(propsToAvoid, prop)) {
+           continue
+         }
+-        if (Object.getOwnPropertyDescriptor(globalRef, prop)?.configurable === false) {
++        const globalRefPropertyDescriptor = Object.getOwnPropertyDescriptor(globalRef, prop);
++        if (globalRefPropertyDescriptor && globalRefPropertyDescriptor.configurable === false) {
+           continue
+         }
+         const desc = {
diff --git a/.yarn/patches/lavamoat-core-npm-14.0.0-0f5bdac846.patch b/.yarn/patches/lavamoat-core-npm-14.0.0-0f5bdac846.patch
new file mode 100644
index 000000000..589d4dea8
--- /dev/null
+++ b/.yarn/patches/lavamoat-core-npm-14.0.0-0f5bdac846.patch
@@ -0,0 +1,16 @@
+diff --git a/src/kernelCoreTemplate.js b/src/kernelCoreTemplate.js
+index c9916f0889c17f850bffe8e5c02b3f804c9ed810..55edb49c936f28b928f74150c748fe80a9add896 100644
+--- a/src/kernelCoreTemplate.js
++++ b/src/kernelCoreTemplate.js
+@@ -138,9 +138,9 @@
+           continue
+         }
+         let desc = Object.getOwnPropertyDescriptor(globalRef, prop)
+-        if (desc?.configurable === true) {
++        if (desc && desc.configurable === true) {
+           desc = { configurable: false, set, get }
+-        } else if (desc?.writable === true) {
++        } else if (desc && desc.writable === true) {
+           const p = new Proxy(obj, { getPrototypeOf: get, get, set } )
+           desc = { configurable: false, writable: false, value: p }
+         } else {
diff --git a/app/scripts/use-snow.js b/app/scripts/use-snow.js
index 11b01d78d..9f55d396d 100644
--- a/app/scripts/use-snow.js
+++ b/app/scripts/use-snow.js
@@ -3,6 +3,6 @@
   const log = console.log.bind(console);
   const msg = 'SNOW INTERCEPTED NEW WINDOW CREATION IN METAMASK APP: ';
   window.top.SNOW((win) => {
-    log(msg, win, win?.frameElement);
+    log(msg, win, win && win.frameElement);
   });
 })();
diff --git a/development/build/index.js b/development/build/index.js
index 3e8faa372..bf7dc22ae 100755
--- a/development/build/index.js
+++ b/development/build/index.js
@@ -94,6 +94,7 @@ async function defineAndRunBuildTasks() {
       'navigator',
       'harden',
       'console',
+      'location',
       // globals chrome driver needs to function (test env)
       /cdc_[a-zA-Z0-9]+_[a-zA-Z]+/iu,
       'performance',
diff --git a/package.json b/package.json
index a4e179b2d..5897ea23d 100644
--- a/package.json
+++ b/package.json
@@ -202,7 +202,11 @@
     "async-done@~1.3.2": "patch:async-done@npm%3A1.3.2#./.yarn/patches/async-done-npm-1.3.2-1f0a4a8997.patch",
     "async-done@^1.2.0": "patch:async-done@npm%3A1.3.2#./.yarn/patches/async-done-npm-1.3.2-1f0a4a8997.patch",
     "async-done@^1.2.2": "patch:async-done@npm%3A1.3.2#./.yarn/patches/async-done-npm-1.3.2-1f0a4a8997.patch",
-    "fast-json-patch@^3.1.1": "patch:fast-json-patch@npm%3A3.1.1#./.yarn/patches/fast-json-patch-npm-3.1.1-7e8bb70a45.patch"
+    "fast-json-patch@^3.1.1": "patch:fast-json-patch@npm%3A3.1.1#./.yarn/patches/fast-json-patch-npm-3.1.1-7e8bb70a45.patch",
+    "lavamoat-core@^14.0.0": "patch:lavamoat-core@npm%3A14.0.0#./.yarn/patches/lavamoat-core-npm-14.0.0-0f5bdac846.patch",
+    "lavamoat-core@^12.3.0": "patch:lavamoat-core@npm%3A12.4.0#./.yarn/patches/lavamoat-core-npm-12.4.0-cecca1a9b5.patch",
+    "lavamoat-core@^12.4.0": "patch:lavamoat-core@npm%3A12.4.0#./.yarn/patches/lavamoat-core-npm-12.4.0-cecca1a9b5.patch",
+    "@lavamoat/snow@^1.4.1": "patch:@lavamoat/snow@npm%3A1.4.1#./.yarn/patches/@lavamoat-snow-npm-1.4.1-405a48e593.patch"
   },
   "dependencies": {
     "@babel/runtime": "^7.5.5",
diff --git a/yarn.lock b/yarn.lock
index 1936a9513..1e3838669 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3347,7 +3347,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@lavamoat/snow@npm:^1.4.1":
+"@lavamoat/snow@npm:1.4.1":
   version: 1.4.1
   resolution: "@lavamoat/snow@npm:1.4.1"
   dependencies:
@@ -3356,6 +3356,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@lavamoat/snow@patch:@lavamoat/snow@npm%3A1.4.1#./.yarn/patches/@lavamoat-snow-npm-1.4.1-405a48e593.patch::locator=metamask-crx%40workspace%3A.":
+  version: 1.4.1
+  resolution: "@lavamoat/snow@patch:@lavamoat/snow@npm%3A1.4.1#./.yarn/patches/@lavamoat-snow-npm-1.4.1-405a48e593.patch::version=1.4.1&hash=a60c54&locator=metamask-crx%40workspace%3A."
+  dependencies:
+    is-cross-origin: ^1.0.1
+  checksum: 41bdc22e178a6af18bd1419648ca17b3d214f91e0e8ae714d614b6fb8fa02cf4699d4e488c65855b9b4b91c4d4f29868e5e095883636fdece56d699027eaaa1b
+  languageName: node
+  linkType: hard
+
 "@material-ui/core@npm:^4.11.0":
   version: 4.11.0
   resolution: "@material-ui/core@npm:4.11.0"
@@ -22804,6 +22813,30 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lavamoat-core@npm:12.4.0":
+  version: 12.4.0
+  resolution: "lavamoat-core@npm:12.4.0"
+  dependencies:
+    fromentries: ^1.2.0
+    json-stable-stringify: ^1.0.1
+    lavamoat-tofu: ^6.0.2
+    merge-deep: ^3.0.2
+  checksum: 432a8968035370feb51e50f35306e7f85015e3b56440dbd41b6d3eec7f4bc82c3d1f16c6a627549df2665499c49bcb6e55fa697bccc6839bac1de12804019c1d
+  languageName: node
+  linkType: hard
+
+"lavamoat-core@npm:14.0.0":
+  version: 14.0.0
+  resolution: "lavamoat-core@npm:14.0.0"
+  dependencies:
+    fromentries: ^1.2.0
+    json-stable-stringify: ^1.0.1
+    lavamoat-tofu: ^6.0.2
+    merge-deep: ^3.0.2
+  checksum: 16c2402aceba339ab25b830d476e95078edc1c978ef2623497ecb07f6b5eb8241541f67755a06cf3562680c1834b69d7e86ca421848b670378ad4fb0d62923ad
+  languageName: node
+  linkType: hard
+
 "lavamoat-core@npm:^10.0.1":
   version: 10.1.2
   resolution: "lavamoat-core@npm:10.1.2"
@@ -22817,27 +22850,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lavamoat-core@npm:^12.3.0, lavamoat-core@npm:^12.4.0":
+"lavamoat-core@patch:lavamoat-core@npm%3A12.4.0#./.yarn/patches/lavamoat-core-npm-12.4.0-cecca1a9b5.patch::locator=metamask-crx%40workspace%3A.":
   version: 12.4.0
-  resolution: "lavamoat-core@npm:12.4.0"
+  resolution: "lavamoat-core@patch:lavamoat-core@npm%3A12.4.0#./.yarn/patches/lavamoat-core-npm-12.4.0-cecca1a9b5.patch::version=12.4.0&hash=05194f&locator=metamask-crx%40workspace%3A."
   dependencies:
     fromentries: ^1.2.0
     json-stable-stringify: ^1.0.1
     lavamoat-tofu: ^6.0.2
     merge-deep: ^3.0.2
-  checksum: 432a8968035370feb51e50f35306e7f85015e3b56440dbd41b6d3eec7f4bc82c3d1f16c6a627549df2665499c49bcb6e55fa697bccc6839bac1de12804019c1d
+  checksum: 746968dafef3290c0513af9f4524912df1ffd5fe7e071580e4c81dfa4375b73d4e5b6fbe68f1b8a15f5aa5fb9d1edbdd0befe423be7bdab9b09da5eb0f5ebf55
   languageName: node
   linkType: hard
 
-"lavamoat-core@npm:^14.0.0":
+"lavamoat-core@patch:lavamoat-core@npm%3A14.0.0#./.yarn/patches/lavamoat-core-npm-14.0.0-0f5bdac846.patch::locator=metamask-crx%40workspace%3A.":
   version: 14.0.0
-  resolution: "lavamoat-core@npm:14.0.0"
+  resolution: "lavamoat-core@patch:lavamoat-core@npm%3A14.0.0#./.yarn/patches/lavamoat-core-npm-14.0.0-0f5bdac846.patch::version=14.0.0&hash=fbc9b0&locator=metamask-crx%40workspace%3A."
   dependencies:
     fromentries: ^1.2.0
     json-stable-stringify: ^1.0.1
     lavamoat-tofu: ^6.0.2
     merge-deep: ^3.0.2
-  checksum: 16c2402aceba339ab25b830d476e95078edc1c978ef2623497ecb07f6b5eb8241541f67755a06cf3562680c1834b69d7e86ca421848b670378ad4fb0d62923ad
+  checksum: ea6be14fbfba7f285d7a9238d78db1d3eb6a91a1b5f382152c1ce0fef1708d55fe4e730aa2663d0b36dd2c7e2abc926d79f2b8e7ce3bcfe0e4ddf7d4634e59f5
   languageName: node
   linkType: hard
 

From d4bc0a453bab219039b2dbd4082e2639d7a0dcfe Mon Sep 17 00:00:00 2001
From: Danica Shen <zhaodanica@gmail.com>
Date: Wed, 8 Mar 2023 16:05:55 +0000
Subject: [PATCH 28/36] fix(17542): fix fiat currency display in few txn
 actions (#18011)

* fix(17542): fix fiat currency display in few txn actions

* fix(17542): refactor e2e tests to change to fia via fixture builder
---
 test/e2e/tests/encrypt-decrypt.spec.js        |   87 +-
 .../signature-request-original.component.js   |   33 +-
 .../signature-request-original.container.js   |    9 +-
 .../signature-request.component.test.js.snap  | 1552 +++++++++--------
 .../signature-request.component.js            |   43 +-
 .../signature-request.component.test.js       |  127 +-
 .../signature-request.container.js            |    9 +-
 .../signature-request.container.test.js       |  296 ++--
 ...irm-decrypt-message.component.test.js.snap |  531 ++++++
 .../confirm-decrypt-message.component.js      |   42 +-
 .../confirm-decrypt-message.component.test.js |  130 ++
 .../confirm-decrypt-message.container.js      |    9 +
 ...cryption-public-key.component.test.js.snap |  499 ++++++
 ...confirm-encryption-public-key.component.js |   35 +-
 ...rm-encryption-public-key.component.test.js |   79 +
 ...confirm-encryption-public-key.container.js |    9 +
 .../confirm-encryption-public-key.stories.js  |    7 +
 .../__snapshots__/index.test.js.snap          |    1 +
 18 files changed, 2465 insertions(+), 1033 deletions(-)
 create mode 100644 ui/pages/confirm-decrypt-message/__snapshots__/confirm-decrypt-message.component.test.js.snap
 create mode 100644 ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.test.js
 create mode 100644 ui/pages/confirm-encryption-public-key/__snapshots__/confirm-encryption-public-key.component.test.js.snap
 create mode 100644 ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.test.js

diff --git a/test/e2e/tests/encrypt-decrypt.spec.js b/test/e2e/tests/encrypt-decrypt.spec.js
index 0507bf527..d9216ccd0 100644
--- a/test/e2e/tests/encrypt-decrypt.spec.js
+++ b/test/e2e/tests/encrypt-decrypt.spec.js
@@ -42,11 +42,6 @@ describe('Encrypt Decrypt', function () {
           css: '.request-encryption-public-key__header__text',
           text: 'Request encryption public key',
         });
-        // Account balance is converted properly
-        const accountBalanceLabel = await driver.findElement(
-          '.request-encryption-public-key__balance-value',
-        );
-        assert.equal(await accountBalanceLabel.getText(), '25 ETH');
         await driver.clickElement({ text: 'Provide', tag: 'button' });
         await driver.waitUntilXWindowHandles(2);
         windowHandles = await driver.getAllWindowHandles();
@@ -99,4 +94,86 @@ describe('Encrypt Decrypt', function () {
       },
     );
   });
+
+  it('should show balance correctly as ETH', 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 driver.openNewPage('http://127.0.0.1:8080');
+
+        // ------ Get Encryption key and display ETH ------
+        await driver.clickElement('#getEncryptionKeyButton');
+        await driver.waitUntilXWindowHandles(3);
+        const windowHandles = await driver.getAllWindowHandles();
+        await driver.switchToWindowWithTitle(
+          'MetaMask Notification',
+          windowHandles,
+        );
+        await driver.waitForSelector({
+          css: '.request-encryption-public-key__header__text',
+          text: 'Request encryption public key',
+        });
+        // Account balance is converted properly
+        const accountBalanceLabel = await driver.findElement(
+          '.request-encryption-public-key__balance-value',
+        );
+        assert.equal(await accountBalanceLabel.getText(), '25 ETH');
+      },
+    );
+  });
+
+  it('should show balance correctly as Fiat', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withPermissionControllerConnectedToTestDapp()
+          .withPreferencesController({
+            preferences: {
+              useNativeCurrencyAsPrimaryCurrency: false,
+            },
+          })
+          .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 driver.clickElement('.account-menu__icon');
+        await driver.openNewPage('http://127.0.0.1:8080');
+
+        // ------ Get Encryption key and display ETH ------
+        await driver.clickElement('#getEncryptionKeyButton');
+        await driver.waitUntilXWindowHandles(3);
+        const windowHandles = await driver.getAllWindowHandles();
+        await driver.switchToWindowWithTitle(
+          'MetaMask Notification',
+          windowHandles,
+        );
+        await driver.waitForSelector({
+          css: '.request-encryption-public-key__header__text',
+          text: 'Request encryption public key',
+        });
+
+        // Account balance is converted properly
+        const accountBalanceLabel = await driver.findElement(
+          '.request-encryption-public-key__balance-value',
+        );
+        assert.equal(await accountBalanceLabel.getText(), '$42,500.00 USD');
+      },
+    );
+  });
 });
diff --git a/ui/components/app/signature-request-original/signature-request-original.component.js b/ui/components/app/signature-request-original/signature-request-original.component.js
index 570d5821a..6e5fd5313 100644
--- a/ui/components/app/signature-request-original/signature-request-original.component.js
+++ b/ui/components/app/signature-request-original/signature-request-original.component.js
@@ -22,6 +22,9 @@ import { NETWORK_TYPES } from '../../../../shared/constants/network';
 import { Numeric } from '../../../../shared/modules/Numeric';
 import { EtherDenomination } from '../../../../shared/constants/common';
 import ConfirmPageContainerNavigation from '../confirm-page-container/confirm-page-container-navigation';
+import { formatCurrency } from '../../../helpers/utils/confirm-tx.util';
+import { getValueFromWeiHex } from '../../../../shared/modules/conversion.utils';
+
 import SignatureRequestOriginalWarning from './signature-request-original-warning';
 
 export default class SignatureRequestOriginal extends Component {
@@ -45,6 +48,8 @@ export default class SignatureRequestOriginal extends Component {
     hardwareWalletRequiresConnection: PropTypes.bool,
     isLedgerWallet: PropTypes.bool,
     nativeCurrency: PropTypes.string.isRequired,
+    currentCurrency: PropTypes.string.isRequired,
+    conversionRate: PropTypes.number,
     messagesCount: PropTypes.number,
     showRejectTransactionsConfirmationModal: PropTypes.func.isRequired,
     cancelAll: PropTypes.func.isRequired,
@@ -269,7 +274,9 @@ export default class SignatureRequestOriginal extends Component {
     const {
       messagesCount,
       nativeCurrency,
+      currentCurrency,
       fromAccount: { address, balance, name },
+      conversionRate,
     } = this.props;
     const { showSignatureRequestWarning } = this.state;
     const { t } = this.context;
@@ -277,11 +284,23 @@ export default class SignatureRequestOriginal extends Component {
     const rejectNText = t('rejectRequestsN', [messagesCount]);
     const currentNetwork = this.getNetworkName();
 
-    const balanceInBaseAsset = new Numeric(balance, 16, EtherDenomination.WEI)
-      .toDenomination(EtherDenomination.ETH)
-      .toBase(10)
-      .round(6)
-      .toString();
+    const balanceInBaseAsset = conversionRate
+      ? formatCurrency(
+          getValueFromWeiHex({
+            value: balance,
+            fromCurrency: nativeCurrency,
+            toCurrency: currentCurrency,
+            conversionRate,
+            numberOfDecimals: 6,
+            toDenomination: EtherDenomination.ETH,
+          }),
+          currentCurrency,
+        )
+      : new Numeric(balance, 16, EtherDenomination.WEI)
+          .toDenomination(EtherDenomination.ETH)
+          .round(6)
+          .toBase(10)
+          .toString();
 
     return (
       <div className="request-signature__container">
@@ -293,7 +312,9 @@ export default class SignatureRequestOriginal extends Component {
             networkName={currentNetwork}
             accountName={name}
             accountBalance={balanceInBaseAsset}
-            tokenName={nativeCurrency}
+            tokenName={
+              conversionRate ? currentCurrency?.toUpperCase() : nativeCurrency
+            }
             accountAddress={address}
           />
         </div>
diff --git a/ui/components/app/signature-request-original/signature-request-original.container.js b/ui/components/app/signature-request-original/signature-request-original.container.js
index 3d7c9aa65..13437bb74 100644
--- a/ui/components/app/signature-request-original/signature-request-original.container.js
+++ b/ui/components/app/signature-request-original/signature-request-original.container.js
@@ -11,6 +11,8 @@ import {
   doesAddressRequireLedgerHidConnection,
   unconfirmedMessagesHashSelector,
   getTotalUnapprovedMessagesCount,
+  getPreferences,
+  getCurrentCurrency,
 } from '../../../selectors';
 import { getAccountByAddress, valuesFor } from '../../../helpers/utils/util';
 import { clearConfirmTransaction } from '../../../ducks/confirm-transaction/confirm-transaction.duck';
@@ -32,14 +34,19 @@ function mapStateToProps(state, ownProps) {
   const isLedgerWallet = isAddressLedger(state, from);
   const messagesList = unconfirmedMessagesHashSelector(state);
   const messagesCount = getTotalUnapprovedMessagesCount(state);
+  const { useNativeCurrencyAsPrimaryCurrency } = getPreferences(state);
+
   return {
     requester: null,
     requesterAddress: null,
-    conversionRate: conversionRateSelector(state),
     mostRecentOverviewPage: getMostRecentOverviewPage(state),
     hardwareWalletRequiresConnection,
     isLedgerWallet,
     nativeCurrency: getNativeCurrency(state),
+    currentCurrency: getCurrentCurrency(state),
+    conversionRate: useNativeCurrencyAsPrimaryCurrency
+      ? null
+      : conversionRateSelector(state),
     // not passed to component
     allAccounts: accountsWithSendEtherInfoSelector(state),
     subjectMetadata: getSubjectMetadata(state),
diff --git a/ui/components/app/signature-request/__snapshots__/signature-request.component.test.js.snap b/ui/components/app/signature-request/__snapshots__/signature-request.component.test.js.snap
index df3631f5b..8a8ddd8a5 100644
--- a/ui/components/app/signature-request/__snapshots__/signature-request.component.test.js.snap
+++ b/ui/components/app/signature-request/__snapshots__/signature-request.component.test.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Signature Request Component render should match snapshot when useNativeCurrencyAsPrimaryCurrency is false 1`] = `
+exports[`Signature Request Component render should match snapshot when we are using eth 1`] = `
 <div>
   <div
     class="signature-request"
@@ -73,6 +73,7 @@ exports[`Signature Request Component render should match snapshot when useNative
     </div>
     <div
       class="request-signature__account"
+      data-testid="request-signature-account"
     >
       <div
         class="box network-account-balance-header box--padding-4 box--display-flex box--flex-direction-row box--justify-content-space-between box--align-items-center"
@@ -147,779 +148,9 @@ exports[`Signature Request Component render should match snapshot when useNative
             </h6>
             <h6
               class="box box--margin-bottom-1 box--flex-direction-row typography typography--h6 typography--weight-bold typography--style-normal typography--color-text-default"
-            />
-          </div>
-        </div>
-        <div
-          class="box box--display-flex box--flex-direction-column box--align-items-flex-end"
-        >
-          <h6
-            class="box box--margin-top-1 box--flex-direction-row typography typography--h6 typography--weight-normal typography--style-normal typography--color-text-alternative"
-          >
-            Balance
-          </h6>
-          <h6
-            class="box box--margin-bottom-1 box--flex-direction-row typography typography--h6 typography--weight-bold typography--style-normal typography--align-end typography--color-text-default"
-          >
-            0
-             
-            DEF
-          </h6>
-        </div>
-      </div>
-    </div>
-    <div
-      class="signature-request-content"
-    >
-      <div
-        class="signature-request__origin"
-      >
-        <div
-          class="site-origin"
-        >
-          <div
-            class="chip chip--with-left-icon chip--border-color-border-muted chip--background-color-undefined"
-          >
-            <div
-              class="chip__left-icon"
             >
-              <div
-                class=""
-              >
-                <span
-                  class="icon-with-fallback__fallback"
-                >
-                  T
-                </span>
-              </div>
-            </div>
-            <span
-              class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography chip__label typography--h6 typography--weight-normal typography--style-normal typography--color-text-alternative"
-            >
-              test
-            </span>
-          </div>
-        </div>
-      </div>
-      <h3
-        class="box box--margin-top-4 box--margin-bottom-1 box--flex-direction-row typography signature-request__content__title typography--h3 typography--weight-bold typography--style-normal typography--color-text-default"
-      >
-        Signature request
-      </h3>
-      <h6
-        class="box box--margin-12 box--margin-top-3 box--margin-bottom-1 box--flex-direction-row typography request-signature__content__subtitle typography--h7 typography--weight-normal typography--style-normal typography--align-center typography--color-text-alternative"
-      >
-        Only sign this message if you fully understand the content and trust the requesting site.
-      </h6>
-      <div>
-        <a
-          class="button btn-link signature-request-content__verify-contract-details"
-          data-testid="verify-contract-details"
-          role="button"
-          tabindex="0"
-        >
-          <h6
-            class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography typography--h7 typography--weight-normal typography--style-normal typography--color-primary-default"
-          >
-            Verify contract details
-          </h6>
-        </a>
-      </div>
-    </div>
-    <div
-      class="box signature-request-message box--display-flex box--flex-direction-column"
-    >
-      <div
-        class="box signature-request-message__root box--margin-2 box--padding-top-3 box--padding-right-3 box--padding-bottom-3 box--flex-direction-row box--background-color-background-default box--rounded-xl box--border-color-border-muted box--border-style-solid box--border-width-1"
-      >
-        <p
-          class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-message__title typography--p typography--weight-bold typography--style-normal typography--color-text-default"
-        >
-          Mail
-        </p>
-        <div
-          class="box signature-request-data__node box--flex-direction-row"
-        >
-          <div
-            class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
-          >
-            <span
-              class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
-            >
-              Contents
-              :
-               
-            </span>
-            <span
-              class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
-            >
-              Hello, Bob!
-            </span>
-          </div>
-          <div
-            class="box signature-request-data__node box--padding-left-2 box--flex-direction-row"
-          >
-            <span
-              class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-bold typography--style-normal typography--color-text-default"
-            >
-              From
-              :
-               
-            </span>
-            <div
-              class="box signature-request-data__node box--flex-direction-row"
-            >
-              <div
-                class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
-              >
-                <span
-                  class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
-                >
-                  Name
-                  :
-                   
-                </span>
-                <span
-                  class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
-                >
-                  Cow
-                </span>
-              </div>
-              <div
-                class="box signature-request-data__node box--padding-left-2 box--flex-direction-row"
-              >
-                <span
-                  class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-bold typography--style-normal typography--color-text-default"
-                >
-                  Wallets
-                  :
-                   
-                </span>
-                <div
-                  class="box signature-request-data__node box--flex-direction-row"
-                >
-                  <div
-                    class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
-                  >
-                    <span
-                      class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
-                    >
-                      0
-                      :
-                       
-                    </span>
-                    <span
-                      class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
-                    >
-                      <h6
-                        class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography signature-request-data__node__value__address typography--h7 typography--weight-normal typography--style-normal typography--color-info-default"
-                      >
-                        <div
-                          class="tx-insight tx-insight-component tx-insight-component-address"
-                        >
-                          <div
-                            class="tx-insight-component-address__sender-icon"
-                          >
-                            <div
-                              class=""
-                            >
-                              <div
-                                class="identicon"
-                                style="height: 18px; width: 18px; border-radius: 9px;"
-                              >
-                                <div
-                                  style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 18px; height: 18px; display: inline-block; background: rgb(35, 98, 225);"
-                                >
-                                  <svg
-                                    height="18"
-                                    width="18"
-                                    x="0"
-                                    y="0"
-                                  >
-                                    <rect
-                                      fill="#FA7900"
-                                      height="18"
-                                      transform="translate(-0.14083532437501936 -0.20904741369718938) rotate(237.8 9 9)"
-                                      width="18"
-                                      x="0"
-                                      y="0"
-                                    />
-                                    <rect
-                                      fill="#034F5E"
-                                      height="18"
-                                      transform="translate(6.169600998273832 -6.532671139783782) rotate(321.2 9 9)"
-                                      width="18"
-                                      x="0"
-                                      y="0"
-                                    />
-                                    <rect
-                                      fill="#FB185C"
-                                      height="18"
-                                      transform="translate(4.879852199205555 12.185539790934872) rotate(190.8 9 9)"
-                                      width="18"
-                                      x="0"
-                                      y="0"
-                                    />
-                                  </svg>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                          <div
-                            class="address__name"
-                          >
-                            0xCD2...D826
-                          </div>
-                        </div>
-                      </h6>
-                    </span>
-                  </div>
-                  <div
-                    class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
-                  >
-                    <span
-                      class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
-                    >
-                      1
-                      :
-                       
-                    </span>
-                    <span
-                      class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
-                    >
-                      <h6
-                        class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography signature-request-data__node__value__address typography--h7 typography--weight-normal typography--style-normal typography--color-info-default"
-                      >
-                        <div
-                          class="tx-insight tx-insight-component tx-insight-component-address"
-                        >
-                          <div
-                            class="tx-insight-component-address__sender-icon"
-                          >
-                            <div
-                              class=""
-                            >
-                              <div
-                                class="identicon"
-                                style="height: 18px; width: 18px; border-radius: 9px;"
-                              >
-                                <div
-                                  style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 18px; height: 18px; display: inline-block; background: rgb(24, 183, 242);"
-                                >
-                                  <svg
-                                    height="18"
-                                    width="18"
-                                    x="0"
-                                    y="0"
-                                  >
-                                    <rect
-                                      fill="#F91E01"
-                                      height="18"
-                                      transform="translate(-3.4105516295169465 1.6271792765749349) rotate(179.5 9 9)"
-                                      width="18"
-                                      x="0"
-                                      y="0"
-                                    />
-                                    <rect
-                                      fill="#FA5300"
-                                      height="18"
-                                      transform="translate(0.0011267744354920284 -8.541150536104556) rotate(370.7 9 9)"
-                                      width="18"
-                                      x="0"
-                                      y="0"
-                                    />
-                                    <rect
-                                      fill="#F5A300"
-                                      height="18"
-                                      transform="translate(-10.876212949280989 11.550571889611607) rotate(298.9 9 9)"
-                                      width="18"
-                                      x="0"
-                                      y="0"
-                                    />
-                                  </svg>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                          <div
-                            class="address__name"
-                          >
-                            0xDea...beeF
-                          </div>
-                        </div>
-                      </h6>
-                    </span>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="box signature-request-data__node box--padding-left-2 box--flex-direction-row"
-          >
-            <span
-              class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-bold typography--style-normal typography--color-text-default"
-            >
-              To
-              :
-               
-            </span>
-            <div
-              class="box signature-request-data__node box--flex-direction-row"
-            >
-              <div
-                class="box signature-request-data__node box--padding-left-2 box--flex-direction-row"
-              >
-                <span
-                  class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-bold typography--style-normal typography--color-text-default"
-                >
-                  0
-                  :
-                   
-                </span>
-                <div
-                  class="box signature-request-data__node box--flex-direction-row"
-                >
-                  <div
-                    class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
-                  >
-                    <span
-                      class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
-                    >
-                      Name
-                      :
-                       
-                    </span>
-                    <span
-                      class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
-                    >
-                      Bob
-                    </span>
-                  </div>
-                  <div
-                    class="box signature-request-data__node box--padding-left-2 box--flex-direction-row"
-                  >
-                    <span
-                      class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-bold typography--style-normal typography--color-text-default"
-                    >
-                      Wallets
-                      :
-                       
-                    </span>
-                    <div
-                      class="box signature-request-data__node box--flex-direction-row"
-                    >
-                      <div
-                        class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
-                      >
-                        <span
-                          class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
-                        >
-                          0
-                          :
-                           
-                        </span>
-                        <span
-                          class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
-                        >
-                          <h6
-                            class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography signature-request-data__node__value__address typography--h7 typography--weight-normal typography--style-normal typography--color-info-default"
-                          >
-                            <div
-                              class="tx-insight tx-insight-component tx-insight-component-address"
-                            >
-                              <div
-                                class="tx-insight-component-address__sender-icon"
-                              >
-                                <div
-                                  class=""
-                                >
-                                  <div
-                                    class="identicon"
-                                    style="height: 18px; width: 18px; border-radius: 9px;"
-                                  >
-                                    <div
-                                      style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 18px; height: 18px; display: inline-block; background: rgb(242, 162, 2);"
-                                    >
-                                      <svg
-                                        height="18"
-                                        width="18"
-                                        x="0"
-                                        y="0"
-                                      >
-                                        <rect
-                                          fill="#C8144A"
-                                          height="18"
-                                          transform="translate(3.793157784878341 -1.7274880587885135) rotate(359.3 9 9)"
-                                          width="18"
-                                          x="0"
-                                          y="0"
-                                        />
-                                        <rect
-                                          fill="#01878E"
-                                          height="18"
-                                          transform="translate(-5.130298485812891 -4.633613065334895) rotate(335.8 9 9)"
-                                          width="18"
-                                          x="0"
-                                          y="0"
-                                        />
-                                        <rect
-                                          fill="#1897F2"
-                                          height="18"
-                                          transform="translate(-14.252066920284053 2.4659095087310536) rotate(275.0 9 9)"
-                                          width="18"
-                                          x="0"
-                                          y="0"
-                                        />
-                                      </svg>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                              <div
-                                class="address__name"
-                              >
-                                0xbBb...BBbB
-                              </div>
-                            </div>
-                          </h6>
-                        </span>
-                      </div>
-                      <div
-                        class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
-                      >
-                        <span
-                          class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
-                        >
-                          1
-                          :
-                           
-                        </span>
-                        <span
-                          class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
-                        >
-                          <h6
-                            class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography signature-request-data__node__value__address typography--h7 typography--weight-normal typography--style-normal typography--color-info-default"
-                          >
-                            <div
-                              class="tx-insight tx-insight-component tx-insight-component-address"
-                            >
-                              <div
-                                class="tx-insight-component-address__sender-icon"
-                              >
-                                <div
-                                  class=""
-                                >
-                                  <div
-                                    class="identicon"
-                                    style="height: 18px; width: 18px; border-radius: 9px;"
-                                  >
-                                    <div
-                                      style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 18px; height: 18px; display: inline-block; background: rgb(250, 54, 0);"
-                                    >
-                                      <svg
-                                        height="18"
-                                        width="18"
-                                        x="0"
-                                        y="0"
-                                      >
-                                        <rect
-                                          fill="#2395E1"
-                                          height="18"
-                                          transform="translate(-1.952228683702902 0.5755351329028624) rotate(191.9 9 9)"
-                                          width="18"
-                                          x="0"
-                                          y="0"
-                                        />
-                                        <rect
-                                          fill="#F90101"
-                                          height="18"
-                                          transform="translate(1.931538686012753 -10.436305366725303) rotate(319.8 9 9)"
-                                          width="18"
-                                          x="0"
-                                          y="0"
-                                        />
-                                        <rect
-                                          fill="#F58700"
-                                          height="18"
-                                          transform="translate(11.15341577077021 5.782185845756665) rotate(180.7 9 9)"
-                                          width="18"
-                                          x="0"
-                                          y="0"
-                                        />
-                                      </svg>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                              <div
-                                class="address__name"
-                              >
-                                0xB0B...Ea57
-                              </div>
-                            </div>
-                          </h6>
-                        </span>
-                      </div>
-                      <div
-                        class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
-                      >
-                        <span
-                          class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
-                        >
-                          2
-                          :
-                           
-                        </span>
-                        <span
-                          class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
-                        >
-                          <h6
-                            class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography signature-request-data__node__value__address typography--h7 typography--weight-normal typography--style-normal typography--color-info-default"
-                          >
-                            <div
-                              class="tx-insight tx-insight-component tx-insight-component-address"
-                            >
-                              <div
-                                class="tx-insight-component-address__sender-icon"
-                              >
-                                <div
-                                  class=""
-                                >
-                                  <div
-                                    class="identicon"
-                                    style="height: 18px; width: 18px; border-radius: 9px;"
-                                  >
-                                    <div
-                                      style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 18px; height: 18px; display: inline-block; background: rgb(200, 20, 86);"
-                                    >
-                                      <svg
-                                        height="18"
-                                        width="18"
-                                        x="0"
-                                        y="0"
-                                      >
-                                        <rect
-                                          fill="#018E8C"
-                                          height="18"
-                                          transform="translate(4.486584319523849 0.3999308067724887) rotate(177.8 9 9)"
-                                          width="18"
-                                          x="0"
-                                          y="0"
-                                        />
-                                        <rect
-                                          fill="#F29202"
-                                          height="18"
-                                          transform="translate(-8.123544749536274 -2.791525003061714) rotate(334.6 9 9)"
-                                          width="18"
-                                          x="0"
-                                          y="0"
-                                        />
-                                        <rect
-                                          fill="#236FE1"
-                                          height="18"
-                                          transform="translate(16.44948962669253 -7.0677741181270815) rotate(456.1 9 9)"
-                                          width="18"
-                                          x="0"
-                                          y="0"
-                                        />
-                                      </svg>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                              <div
-                                class="address__name"
-                              >
-                                0xB0B...0000
-                              </div>
-                            </div>
-                          </h6>
-                        </span>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="page-container__footer"
-    >
-      <footer>
-        <button
-          class="button btn--rounded btn-secondary page-container__footer-button page-container__footer-button__cancel"
-          data-testid="page-container-footer-cancel"
-          role="button"
-          tabindex="0"
-        >
-          Reject
-        </button>
-        <button
-          class="button btn--rounded btn-primary page-container__footer-button"
-          data-testid="page-container-footer-next"
-          role="button"
-          tabindex="0"
-        >
-          Sign
-        </button>
-      </footer>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`Signature Request Component render should match snapshot when useNativeCurrencyAsPrimaryCurrency is true 1`] = `
-<div>
-  <div
-    class="signature-request"
-  >
-    <div
-      class="confirm-page-container-navigation"
-      style="display: none;"
-    >
-      <div
-        class="confirm-page-container-navigation__container"
-        data-testid="navigation-container"
-        style="visibility: hidden;"
-      >
-        <button
-          class="confirm-page-container-navigation__arrow"
-          data-testid="first-page"
-        >
-          <i
-            class="fa fa-angle-double-left fa-2x"
-          />
-        </button>
-        <button
-          class="confirm-page-container-navigation__arrow"
-          data-testid="previous-page"
-        >
-          <i
-            class="fa fa-angle-left fa-2x"
-          />
-        </button>
-      </div>
-      <div
-        class="confirm-page-container-navigation__textcontainer"
-      >
-        <div
-          class="confirm-page-container-navigation__navtext"
-        >
-          0
-           
-          of
-           
-          1
-        </div>
-        <div
-          class="confirm-page-container-navigation__longtext"
-        >
-          requests waiting to be acknowledged
-        </div>
-      </div>
-      <div
-        class="confirm-page-container-navigation__container"
-        style="visibility: initial;"
-      >
-        <button
-          class="confirm-page-container-navigation__arrow"
-          data-testid="next-page"
-        >
-          <i
-            class="fa fa-angle-right fa-2x"
-          />
-        </button>
-        <button
-          class="confirm-page-container-navigation__arrow"
-          data-testid="last-page"
-        >
-          <i
-            class="fa fa-angle-double-right fa-2x"
-          />
-        </button>
-      </div>
-    </div>
-    <div
-      class="request-signature__account"
-    >
-      <div
-        class="box network-account-balance-header box--padding-4 box--display-flex box--flex-direction-row box--justify-content-space-between box--align-items-center"
-      >
-        <div
-          class="box box--display-flex box--gap-2 box--flex-direction-row box--align-items-center"
-        >
-          <div
-            class="box box--display-flex box--flex-direction-row box--align-items-center"
-          >
-            <div
-              class=""
-            >
-              <div
-                class="identicon"
-                style="height: 32px; width: 32px; border-radius: 16px;"
-              >
-                <div
-                  style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(245, 228, 0);"
-                >
-                  <svg
-                    height="32"
-                    width="32"
-                    x="0"
-                    y="0"
-                  >
-                    <rect
-                      fill="#F2BE02"
-                      height="32"
-                      transform="translate(5.482725134273373 -5.1953603353074) rotate(387.1 16 16)"
-                      width="32"
-                      x="0"
-                      y="0"
-                    />
-                    <rect
-                      fill="#01778E"
-                      height="32"
-                      transform="translate(-2.6054559418209475 16.704606255523125) rotate(227.4 16 16)"
-                      width="32"
-                      x="0"
-                      y="0"
-                    />
-                    <rect
-                      fill="#C81435"
-                      height="32"
-                      transform="translate(17.969690840904306 -12.592649051897114) rotate(422.3 16 16)"
-                      width="32"
-                      x="0"
-                      y="0"
-                    />
-                  </svg>
-                </div>
-              </div>
-            </div>
-            <div
-              class="network-account-balance-header__network-account__ident-icon-ethereum--gray"
-            >
-              <span
-                class="icon-with-fallback__fallback"
-              >
-                U
-              </span>
-            </div>
-          </div>
-          <div
-            class="box box--display-flex box--flex-direction-column box--align-items-flex-start"
-          >
-            <h6
-              class="box box--margin-top-1 box--flex-direction-row typography typography--h6 typography--weight-normal typography--style-normal typography--color-text-alternative"
-            >
-              Unknown private network
+              Antonio
             </h6>
-            <h6
-              class="box box--margin-bottom-1 box--flex-direction-row typography typography--h6 typography--weight-bold typography--style-normal typography--color-text-default"
-            />
           </div>
         </div>
         <div
@@ -933,7 +164,7 @@ exports[`Signature Request Component render should match snapshot when useNative
           <h6
             class="box box--margin-bottom-1 box--flex-direction-row typography typography--h6 typography--weight-bold typography--style-normal typography--align-end typography--color-text-default"
           >
-            0
+            966.987986
              
             ABC
           </h6>
@@ -1543,3 +774,778 @@ exports[`Signature Request Component render should match snapshot when useNative
   </div>
 </div>
 `;
+
+exports[`Signature Request Component render should match snapshot when we want to switch to fiat 1`] = `
+<div>
+  <div
+    class="signature-request"
+  >
+    <div
+      class="confirm-page-container-navigation"
+      style="display: none;"
+    >
+      <div
+        class="confirm-page-container-navigation__container"
+        data-testid="navigation-container"
+        style="visibility: hidden;"
+      >
+        <button
+          class="confirm-page-container-navigation__arrow"
+          data-testid="first-page"
+        >
+          <i
+            class="fa fa-angle-double-left fa-2x"
+          />
+        </button>
+        <button
+          class="confirm-page-container-navigation__arrow"
+          data-testid="previous-page"
+        >
+          <i
+            class="fa fa-angle-left fa-2x"
+          />
+        </button>
+      </div>
+      <div
+        class="confirm-page-container-navigation__textcontainer"
+      >
+        <div
+          class="confirm-page-container-navigation__navtext"
+        >
+          0
+           
+          of
+           
+          1
+        </div>
+        <div
+          class="confirm-page-container-navigation__longtext"
+        >
+          requests waiting to be acknowledged
+        </div>
+      </div>
+      <div
+        class="confirm-page-container-navigation__container"
+        style="visibility: initial;"
+      >
+        <button
+          class="confirm-page-container-navigation__arrow"
+          data-testid="next-page"
+        >
+          <i
+            class="fa fa-angle-right fa-2x"
+          />
+        </button>
+        <button
+          class="confirm-page-container-navigation__arrow"
+          data-testid="last-page"
+        >
+          <i
+            class="fa fa-angle-double-right fa-2x"
+          />
+        </button>
+      </div>
+    </div>
+    <div
+      class="request-signature__account"
+      data-testid="request-signature-account"
+    >
+      <div
+        class="box network-account-balance-header box--padding-4 box--display-flex box--flex-direction-row box--justify-content-space-between box--align-items-center"
+      >
+        <div
+          class="box box--display-flex box--gap-2 box--flex-direction-row box--align-items-center"
+        >
+          <div
+            class="box box--display-flex box--flex-direction-row box--align-items-center"
+          >
+            <div
+              class=""
+            >
+              <div
+                class="identicon"
+                style="height: 32px; width: 32px; border-radius: 16px;"
+              >
+                <div
+                  style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(245, 228, 0);"
+                >
+                  <svg
+                    height="32"
+                    width="32"
+                    x="0"
+                    y="0"
+                  >
+                    <rect
+                      fill="#F2BE02"
+                      height="32"
+                      transform="translate(5.482725134273373 -5.1953603353074) rotate(387.1 16 16)"
+                      width="32"
+                      x="0"
+                      y="0"
+                    />
+                    <rect
+                      fill="#01778E"
+                      height="32"
+                      transform="translate(-2.6054559418209475 16.704606255523125) rotate(227.4 16 16)"
+                      width="32"
+                      x="0"
+                      y="0"
+                    />
+                    <rect
+                      fill="#C81435"
+                      height="32"
+                      transform="translate(17.969690840904306 -12.592649051897114) rotate(422.3 16 16)"
+                      width="32"
+                      x="0"
+                      y="0"
+                    />
+                  </svg>
+                </div>
+              </div>
+            </div>
+            <div
+              class="network-account-balance-header__network-account__ident-icon-ethereum--gray"
+            >
+              <span
+                class="icon-with-fallback__fallback"
+              >
+                U
+              </span>
+            </div>
+          </div>
+          <div
+            class="box box--display-flex box--flex-direction-column box--align-items-flex-start"
+          >
+            <h6
+              class="box box--margin-top-1 box--flex-direction-row typography typography--h6 typography--weight-normal typography--style-normal typography--color-text-alternative"
+            >
+              Unknown private network
+            </h6>
+            <h6
+              class="box box--margin-bottom-1 box--flex-direction-row typography typography--h6 typography--weight-bold typography--style-normal typography--color-text-default"
+            >
+              Antonio
+            </h6>
+          </div>
+        </div>
+        <div
+          class="box box--display-flex box--flex-direction-column box--align-items-flex-end"
+        >
+          <h6
+            class="box box--margin-top-1 box--flex-direction-row typography typography--h6 typography--weight-normal typography--style-normal typography--color-text-alternative"
+          >
+            Balance
+          </h6>
+          <h6
+            class="box box--margin-bottom-1 box--flex-direction-row typography typography--h6 typography--weight-bold typography--style-normal typography--align-end typography--color-text-default"
+          >
+            1515270.174798
+             
+            DEF
+          </h6>
+        </div>
+      </div>
+    </div>
+    <div
+      class="signature-request-content"
+    >
+      <div
+        class="signature-request__origin"
+      >
+        <div
+          class="site-origin"
+        >
+          <div
+            class="chip chip--with-left-icon chip--border-color-border-muted chip--background-color-undefined"
+          >
+            <div
+              class="chip__left-icon"
+            >
+              <div
+                class=""
+              >
+                <span
+                  class="icon-with-fallback__fallback"
+                >
+                  T
+                </span>
+              </div>
+            </div>
+            <span
+              class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography chip__label typography--h6 typography--weight-normal typography--style-normal typography--color-text-alternative"
+            >
+              test
+            </span>
+          </div>
+        </div>
+      </div>
+      <h3
+        class="box box--margin-top-4 box--margin-bottom-1 box--flex-direction-row typography signature-request__content__title typography--h3 typography--weight-bold typography--style-normal typography--color-text-default"
+      >
+        Signature request
+      </h3>
+      <h6
+        class="box box--margin-12 box--margin-top-3 box--margin-bottom-1 box--flex-direction-row typography request-signature__content__subtitle typography--h7 typography--weight-normal typography--style-normal typography--align-center typography--color-text-alternative"
+      >
+        Only sign this message if you fully understand the content and trust the requesting site.
+      </h6>
+      <div>
+        <a
+          class="button btn-link signature-request-content__verify-contract-details"
+          data-testid="verify-contract-details"
+          role="button"
+          tabindex="0"
+        >
+          <h6
+            class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography typography--h7 typography--weight-normal typography--style-normal typography--color-primary-default"
+          >
+            Verify contract details
+          </h6>
+        </a>
+      </div>
+    </div>
+    <div
+      class="box signature-request-message box--display-flex box--flex-direction-column"
+    >
+      <div
+        class="box signature-request-message__root box--margin-2 box--padding-top-3 box--padding-right-3 box--padding-bottom-3 box--flex-direction-row box--background-color-background-default box--rounded-xl box--border-color-border-muted box--border-style-solid box--border-width-1"
+      >
+        <p
+          class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-message__title typography--p typography--weight-bold typography--style-normal typography--color-text-default"
+        >
+          Mail
+        </p>
+        <div
+          class="box signature-request-data__node box--flex-direction-row"
+        >
+          <div
+            class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
+          >
+            <span
+              class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+            >
+              Contents
+              :
+               
+            </span>
+            <span
+              class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+            >
+              Hello, Bob!
+            </span>
+          </div>
+          <div
+            class="box signature-request-data__node box--padding-left-2 box--flex-direction-row"
+          >
+            <span
+              class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-bold typography--style-normal typography--color-text-default"
+            >
+              From
+              :
+               
+            </span>
+            <div
+              class="box signature-request-data__node box--flex-direction-row"
+            >
+              <div
+                class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
+              >
+                <span
+                  class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                >
+                  Name
+                  :
+                   
+                </span>
+                <span
+                  class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                >
+                  Cow
+                </span>
+              </div>
+              <div
+                class="box signature-request-data__node box--padding-left-2 box--flex-direction-row"
+              >
+                <span
+                  class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-bold typography--style-normal typography--color-text-default"
+                >
+                  Wallets
+                  :
+                   
+                </span>
+                <div
+                  class="box signature-request-data__node box--flex-direction-row"
+                >
+                  <div
+                    class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
+                  >
+                    <span
+                      class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                    >
+                      0
+                      :
+                       
+                    </span>
+                    <span
+                      class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                    >
+                      <h6
+                        class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography signature-request-data__node__value__address typography--h7 typography--weight-normal typography--style-normal typography--color-info-default"
+                      >
+                        <div
+                          class="tx-insight tx-insight-component tx-insight-component-address"
+                        >
+                          <div
+                            class="tx-insight-component-address__sender-icon"
+                          >
+                            <div
+                              class=""
+                            >
+                              <div
+                                class="identicon"
+                                style="height: 18px; width: 18px; border-radius: 9px;"
+                              >
+                                <div
+                                  style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 18px; height: 18px; display: inline-block; background: rgb(35, 98, 225);"
+                                >
+                                  <svg
+                                    height="18"
+                                    width="18"
+                                    x="0"
+                                    y="0"
+                                  >
+                                    <rect
+                                      fill="#FA7900"
+                                      height="18"
+                                      transform="translate(-0.14083532437501936 -0.20904741369718938) rotate(237.8 9 9)"
+                                      width="18"
+                                      x="0"
+                                      y="0"
+                                    />
+                                    <rect
+                                      fill="#034F5E"
+                                      height="18"
+                                      transform="translate(6.169600998273832 -6.532671139783782) rotate(321.2 9 9)"
+                                      width="18"
+                                      x="0"
+                                      y="0"
+                                    />
+                                    <rect
+                                      fill="#FB185C"
+                                      height="18"
+                                      transform="translate(4.879852199205555 12.185539790934872) rotate(190.8 9 9)"
+                                      width="18"
+                                      x="0"
+                                      y="0"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <div
+                            class="address__name"
+                          >
+                            0xCD2...D826
+                          </div>
+                        </div>
+                      </h6>
+                    </span>
+                  </div>
+                  <div
+                    class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
+                  >
+                    <span
+                      class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                    >
+                      1
+                      :
+                       
+                    </span>
+                    <span
+                      class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                    >
+                      <h6
+                        class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography signature-request-data__node__value__address typography--h7 typography--weight-normal typography--style-normal typography--color-info-default"
+                      >
+                        <div
+                          class="tx-insight tx-insight-component tx-insight-component-address"
+                        >
+                          <div
+                            class="tx-insight-component-address__sender-icon"
+                          >
+                            <div
+                              class=""
+                            >
+                              <div
+                                class="identicon"
+                                style="height: 18px; width: 18px; border-radius: 9px;"
+                              >
+                                <div
+                                  style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 18px; height: 18px; display: inline-block; background: rgb(24, 183, 242);"
+                                >
+                                  <svg
+                                    height="18"
+                                    width="18"
+                                    x="0"
+                                    y="0"
+                                  >
+                                    <rect
+                                      fill="#F91E01"
+                                      height="18"
+                                      transform="translate(-3.4105516295169465 1.6271792765749349) rotate(179.5 9 9)"
+                                      width="18"
+                                      x="0"
+                                      y="0"
+                                    />
+                                    <rect
+                                      fill="#FA5300"
+                                      height="18"
+                                      transform="translate(0.0011267744354920284 -8.541150536104556) rotate(370.7 9 9)"
+                                      width="18"
+                                      x="0"
+                                      y="0"
+                                    />
+                                    <rect
+                                      fill="#F5A300"
+                                      height="18"
+                                      transform="translate(-10.876212949280989 11.550571889611607) rotate(298.9 9 9)"
+                                      width="18"
+                                      x="0"
+                                      y="0"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <div
+                            class="address__name"
+                          >
+                            0xDea...beeF
+                          </div>
+                        </div>
+                      </h6>
+                    </span>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="box signature-request-data__node box--padding-left-2 box--flex-direction-row"
+          >
+            <span
+              class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-bold typography--style-normal typography--color-text-default"
+            >
+              To
+              :
+               
+            </span>
+            <div
+              class="box signature-request-data__node box--flex-direction-row"
+            >
+              <div
+                class="box signature-request-data__node box--padding-left-2 box--flex-direction-row"
+              >
+                <span
+                  class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-bold typography--style-normal typography--color-text-default"
+                >
+                  0
+                  :
+                   
+                </span>
+                <div
+                  class="box signature-request-data__node box--flex-direction-row"
+                >
+                  <div
+                    class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
+                  >
+                    <span
+                      class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                    >
+                      Name
+                      :
+                       
+                    </span>
+                    <span
+                      class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                    >
+                      Bob
+                    </span>
+                  </div>
+                  <div
+                    class="box signature-request-data__node box--padding-left-2 box--flex-direction-row"
+                  >
+                    <span
+                      class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-bold typography--style-normal typography--color-text-default"
+                    >
+                      Wallets
+                      :
+                       
+                    </span>
+                    <div
+                      class="box signature-request-data__node box--flex-direction-row"
+                    >
+                      <div
+                        class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
+                      >
+                        <span
+                          class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                        >
+                          0
+                          :
+                           
+                        </span>
+                        <span
+                          class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                        >
+                          <h6
+                            class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography signature-request-data__node__value__address typography--h7 typography--weight-normal typography--style-normal typography--color-info-default"
+                          >
+                            <div
+                              class="tx-insight tx-insight-component tx-insight-component-address"
+                            >
+                              <div
+                                class="tx-insight-component-address__sender-icon"
+                              >
+                                <div
+                                  class=""
+                                >
+                                  <div
+                                    class="identicon"
+                                    style="height: 18px; width: 18px; border-radius: 9px;"
+                                  >
+                                    <div
+                                      style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 18px; height: 18px; display: inline-block; background: rgb(242, 162, 2);"
+                                    >
+                                      <svg
+                                        height="18"
+                                        width="18"
+                                        x="0"
+                                        y="0"
+                                      >
+                                        <rect
+                                          fill="#C8144A"
+                                          height="18"
+                                          transform="translate(3.793157784878341 -1.7274880587885135) rotate(359.3 9 9)"
+                                          width="18"
+                                          x="0"
+                                          y="0"
+                                        />
+                                        <rect
+                                          fill="#01878E"
+                                          height="18"
+                                          transform="translate(-5.130298485812891 -4.633613065334895) rotate(335.8 9 9)"
+                                          width="18"
+                                          x="0"
+                                          y="0"
+                                        />
+                                        <rect
+                                          fill="#1897F2"
+                                          height="18"
+                                          transform="translate(-14.252066920284053 2.4659095087310536) rotate(275.0 9 9)"
+                                          width="18"
+                                          x="0"
+                                          y="0"
+                                        />
+                                      </svg>
+                                    </div>
+                                  </div>
+                                </div>
+                              </div>
+                              <div
+                                class="address__name"
+                              >
+                                0xbBb...BBbB
+                              </div>
+                            </div>
+                          </h6>
+                        </span>
+                      </div>
+                      <div
+                        class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
+                      >
+                        <span
+                          class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                        >
+                          1
+                          :
+                           
+                        </span>
+                        <span
+                          class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                        >
+                          <h6
+                            class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography signature-request-data__node__value__address typography--h7 typography--weight-normal typography--style-normal typography--color-info-default"
+                          >
+                            <div
+                              class="tx-insight tx-insight-component tx-insight-component-address"
+                            >
+                              <div
+                                class="tx-insight-component-address__sender-icon"
+                              >
+                                <div
+                                  class=""
+                                >
+                                  <div
+                                    class="identicon"
+                                    style="height: 18px; width: 18px; border-radius: 9px;"
+                                  >
+                                    <div
+                                      style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 18px; height: 18px; display: inline-block; background: rgb(250, 54, 0);"
+                                    >
+                                      <svg
+                                        height="18"
+                                        width="18"
+                                        x="0"
+                                        y="0"
+                                      >
+                                        <rect
+                                          fill="#2395E1"
+                                          height="18"
+                                          transform="translate(-1.952228683702902 0.5755351329028624) rotate(191.9 9 9)"
+                                          width="18"
+                                          x="0"
+                                          y="0"
+                                        />
+                                        <rect
+                                          fill="#F90101"
+                                          height="18"
+                                          transform="translate(1.931538686012753 -10.436305366725303) rotate(319.8 9 9)"
+                                          width="18"
+                                          x="0"
+                                          y="0"
+                                        />
+                                        <rect
+                                          fill="#F58700"
+                                          height="18"
+                                          transform="translate(11.15341577077021 5.782185845756665) rotate(180.7 9 9)"
+                                          width="18"
+                                          x="0"
+                                          y="0"
+                                        />
+                                      </svg>
+                                    </div>
+                                  </div>
+                                </div>
+                              </div>
+                              <div
+                                class="address__name"
+                              >
+                                0xB0B...Ea57
+                              </div>
+                            </div>
+                          </h6>
+                        </span>
+                      </div>
+                      <div
+                        class="box signature-request-data__node box--padding-left-2 box--display-flex box--flex-direction-row"
+                      >
+                        <span
+                          class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                        >
+                          2
+                          :
+                           
+                        </span>
+                        <span
+                          class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-4 box--flex-direction-row typography signature-request-data__node__value typography--p typography--weight-normal typography--style-normal typography--color-text-default"
+                        >
+                          <h6
+                            class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography signature-request-data__node__value__address typography--h7 typography--weight-normal typography--style-normal typography--color-info-default"
+                          >
+                            <div
+                              class="tx-insight tx-insight-component tx-insight-component-address"
+                            >
+                              <div
+                                class="tx-insight-component-address__sender-icon"
+                              >
+                                <div
+                                  class=""
+                                >
+                                  <div
+                                    class="identicon"
+                                    style="height: 18px; width: 18px; border-radius: 9px;"
+                                  >
+                                    <div
+                                      style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 18px; height: 18px; display: inline-block; background: rgb(200, 20, 86);"
+                                    >
+                                      <svg
+                                        height="18"
+                                        width="18"
+                                        x="0"
+                                        y="0"
+                                      >
+                                        <rect
+                                          fill="#018E8C"
+                                          height="18"
+                                          transform="translate(4.486584319523849 0.3999308067724887) rotate(177.8 9 9)"
+                                          width="18"
+                                          x="0"
+                                          y="0"
+                                        />
+                                        <rect
+                                          fill="#F29202"
+                                          height="18"
+                                          transform="translate(-8.123544749536274 -2.791525003061714) rotate(334.6 9 9)"
+                                          width="18"
+                                          x="0"
+                                          y="0"
+                                        />
+                                        <rect
+                                          fill="#236FE1"
+                                          height="18"
+                                          transform="translate(16.44948962669253 -7.0677741181270815) rotate(456.1 9 9)"
+                                          width="18"
+                                          x="0"
+                                          y="0"
+                                        />
+                                      </svg>
+                                    </div>
+                                  </div>
+                                </div>
+                              </div>
+                              <div
+                                class="address__name"
+                              >
+                                0xB0B...0000
+                              </div>
+                            </div>
+                          </h6>
+                        </span>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="page-container__footer"
+    >
+      <footer>
+        <button
+          class="button btn--rounded btn-secondary page-container__footer-button page-container__footer-button__cancel"
+          data-testid="page-container-footer-cancel"
+          role="button"
+          tabindex="0"
+        >
+          Reject
+        </button>
+        <button
+          class="button btn--rounded btn-primary page-container__footer-button"
+          data-testid="page-container-footer-next"
+          role="button"
+          tabindex="0"
+        >
+          Sign
+        </button>
+      </footer>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/components/app/signature-request/signature-request.component.js b/ui/components/app/signature-request/signature-request.component.js
index 5c83850cb..d9cf0f88c 100644
--- a/ui/components/app/signature-request/signature-request.component.js
+++ b/ui/components/app/signature-request/signature-request.component.js
@@ -19,6 +19,9 @@ import { NETWORK_TYPES } from '../../../../shared/constants/network';
 import { Numeric } from '../../../../shared/modules/Numeric';
 import { EtherDenomination } from '../../../../shared/constants/common';
 import ConfirmPageContainerNavigation from '../confirm-page-container/confirm-page-container-navigation';
+import { formatCurrency } from '../../../helpers/utils/confirm-tx.util';
+import { getValueFromWeiHex } from '../../../../shared/modules/conversion.utils';
+
 import Footer from './signature-request-footer';
 import Message from './signature-request-message';
 
@@ -66,7 +69,7 @@ export default class SignatureRequest extends PureComponent {
     siteImage: PropTypes.string,
     nativeCurrency: PropTypes.string,
     currentCurrency: PropTypes.string.isRequired,
-    useNativeCurrencyAsPrimaryCurrency: PropTypes.bool.isRequired,
+    conversionRate: PropTypes.number,
     provider: PropTypes.object,
     subjectMetadata: PropTypes.object,
     unapprovedMessagesCount: PropTypes.number,
@@ -161,9 +164,10 @@ export default class SignatureRequest extends PureComponent {
       subjectMetadata,
       nativeCurrency,
       currentCurrency,
-      useNativeCurrencyAsPrimaryCurrency,
+      conversionRate,
       unapprovedMessagesCount,
     } = this.props;
+
     const { t, trackEvent } = this.context;
     const {
       sanitizedMessage,
@@ -172,15 +176,25 @@ export default class SignatureRequest extends PureComponent {
     } = this.memoizedParseMessage(data);
     const rejectNText = t('rejectRequestsN', [unapprovedMessagesCount]);
     const currentNetwork = this.getNetworkName();
-    const tokenName = useNativeCurrencyAsPrimaryCurrency
-      ? nativeCurrency
-      : currentCurrency?.toUpperCase();
 
-    const balanceInBaseAsset = new Numeric(balance, 16, EtherDenomination.WEI)
-      .toDenomination(EtherDenomination.ETH)
-      .round(6)
-      .toBase(10)
-      .toString();
+    const balanceInBaseAsset = conversionRate
+      ? formatCurrency(
+          getValueFromWeiHex({
+            value: balance,
+            fromCurrency: nativeCurrency,
+            toCurrency: currentCurrency,
+            conversionRate,
+            numberOfDecimals: 6,
+            toDenomination: EtherDenomination.ETH,
+          }),
+          currentCurrency,
+        )
+      : new Numeric(balance, 16, EtherDenomination.WEI)
+          .toDenomination(EtherDenomination.ETH)
+          .round(6)
+          .toBase(10)
+          .toString();
+
     const onSign = (event) => {
       sign(event);
       trackEvent({
@@ -219,12 +233,17 @@ export default class SignatureRequest extends PureComponent {
     return (
       <div className="signature-request">
         <ConfirmPageContainerNavigation />
-        <div className="request-signature__account">
+        <div
+          className="request-signature__account"
+          data-testid="request-signature-account"
+        >
           <NetworkAccountBalanceHeader
             networkName={currentNetwork}
             accountName={name}
             accountBalance={balanceInBaseAsset}
-            tokenName={tokenName}
+            tokenName={
+              conversionRate ? currentCurrency?.toUpperCase() : nativeCurrency
+            }
             accountAddress={address}
           />
         </div>
diff --git a/ui/components/app/signature-request/signature-request.component.test.js b/ui/components/app/signature-request/signature-request.component.test.js
index 8c21d71e7..bc793b90e 100644
--- a/ui/components/app/signature-request/signature-request.component.test.js
+++ b/ui/components/app/signature-request/signature-request.component.test.js
@@ -5,15 +5,32 @@ import mockState from '../../../../test/data/mock-state.json';
 import { renderWithProvider } from '../../../../test/lib/render-helpers';
 import SignatureRequest from './signature-request.component';
 
+const baseProps = {
+  hardwareWalletRequiresConnection: false,
+  clearConfirmTransaction: () => undefined,
+  cancel: () => undefined,
+  cancelAll: () => undefined,
+  mostRecentOverviewPage: '/',
+  showRejectTransactionsConfirmationModal: () => undefined,
+  sign: () => undefined,
+  history: { push: '/' },
+  provider: { type: 'rpc' },
+  nativeCurrency: 'ABC',
+  currentCurrency: 'def',
+  fromAccount: {
+    address: '0x123456789abcdef',
+    balance: '0x346ba7725f412cbfdb',
+    name: 'Antonio',
+  },
+};
+
 describe('Signature Request Component', () => {
   const store = configureMockStore()(mockState);
 
   describe('render', () => {
-    let fromAddress;
     let messageData;
 
     beforeEach(() => {
-      fromAddress = '0x123456789abcdef';
       messageData = {
         domain: {
           chainId: 97,
@@ -62,7 +79,7 @@ describe('Signature Request Component', () => {
       };
     });
 
-    it('should match snapshot when useNativeCurrencyAsPrimaryCurrency is false', () => {
+    it('should match snapshot when we want to switch to fiat', () => {
       const msgParams = {
         data: JSON.stringify(messageData),
         version: 'V4',
@@ -70,22 +87,11 @@ describe('Signature Request Component', () => {
       };
       const { container } = renderWithProvider(
         <SignatureRequest
-          hardwareWalletRequiresConnection={false}
-          clearConfirmTransaction={() => undefined}
-          cancel={() => undefined}
-          cancelAll={() => undefined}
-          mostRecentOverviewPage="/"
-          showRejectTransactionsConfirmationModal={() => undefined}
-          history={{ push: '/' }}
-          sign={() => undefined}
+          {...baseProps}
           txData={{
             msgParams,
           }}
-          fromAccount={{ address: fromAddress }}
-          provider={{ type: 'rpc' }}
-          useNativeCurrencyAsPrimaryCurrency={false}
-          nativeCurrency="ABC"
-          currentCurrency="DEF"
+          conversionRate={1567}
         />,
         store,
       );
@@ -93,7 +99,7 @@ describe('Signature Request Component', () => {
       expect(container).toMatchSnapshot();
     });
 
-    it('should match snapshot when useNativeCurrencyAsPrimaryCurrency is true', () => {
+    it('should match snapshot when we are using eth', () => {
       const msgParams = {
         data: JSON.stringify(messageData),
         version: 'V4',
@@ -101,22 +107,11 @@ describe('Signature Request Component', () => {
       };
       const { container } = renderWithProvider(
         <SignatureRequest
-          hardwareWalletRequiresConnection={false}
-          clearConfirmTransaction={() => undefined}
-          cancel={() => undefined}
-          cancelAll={() => undefined}
-          mostRecentOverviewPage="/"
-          showRejectTransactionsConfirmationModal={() => undefined}
-          history={{ push: '/' }}
-          sign={() => undefined}
+          {...baseProps}
           txData={{
             msgParams,
           }}
-          fromAccount={{ address: fromAddress }}
-          provider={{ type: 'rpc' }}
-          useNativeCurrencyAsPrimaryCurrency
-          nativeCurrency="ABC"
-          currentCurrency="DEF"
+          conversionRate={null}
         />,
         store,
       );
@@ -132,19 +127,11 @@ describe('Signature Request Component', () => {
       };
       const { queryByTestId } = renderWithProvider(
         <SignatureRequest
-          hardwareWalletRequiresConnection={false}
-          clearConfirmTransaction={() => undefined}
-          cancel={() => undefined}
-          cancelAll={() => undefined}
-          mostRecentOverviewPage="/"
-          showRejectTransactionsConfirmationModal={() => undefined}
-          history={{ push: '/' }}
-          sign={() => undefined}
+          {...baseProps}
           txData={{
             msgParams,
           }}
-          fromAccount={{ address: fromAddress }}
-          provider={{ type: 'rpc' }}
+          conversionRate={null}
         />,
         store,
       );
@@ -164,19 +151,11 @@ describe('Signature Request Component', () => {
       };
       const { queryByText } = renderWithProvider(
         <SignatureRequest
-          hardwareWalletRequiresConnection={false}
-          clearConfirmTransaction={() => undefined}
-          cancel={() => undefined}
-          cancelAll={() => undefined}
-          mostRecentOverviewPage="/"
-          showRejectTransactionsConfirmationModal={() => undefined}
-          history={{ push: '/' }}
-          sign={() => undefined}
+          {...baseProps}
           txData={{
             msgParams,
           }}
-          fromAccount={{ address: fromAddress }}
-          provider={{ type: 'rpc' }}
+          conversionRate={null}
         />,
         store,
       );
@@ -195,19 +174,11 @@ describe('Signature Request Component', () => {
       };
       const { container } = renderWithProvider(
         <SignatureRequest
-          hardwareWalletRequiresConnection={false}
-          clearConfirmTransaction={() => undefined}
-          cancel={() => undefined}
-          cancelAll={() => undefined}
-          mostRecentOverviewPage="/"
-          showRejectTransactionsConfirmationModal={() => undefined}
-          history={{ push: '/' }}
-          sign={() => undefined}
+          {...baseProps}
           txData={{
             msgParams,
           }}
-          fromAccount={{ address: fromAddress }}
-          provider={{ type: 'rpc' }}
+          conversionRate={null}
         />,
         store,
       );
@@ -225,19 +196,11 @@ describe('Signature Request Component', () => {
       };
       const { container } = renderWithProvider(
         <SignatureRequest
-          hardwareWalletRequiresConnection={false}
-          clearConfirmTransaction={() => undefined}
-          cancel={() => undefined}
-          cancelAll={() => undefined}
-          mostRecentOverviewPage="/"
-          showRejectTransactionsConfirmationModal={() => undefined}
-          history={{ push: '/' }}
-          sign={() => undefined}
+          {...baseProps}
           txData={{
             msgParams,
           }}
-          fromAccount={{ address: fromAddress }}
-          provider={{ type: 'rpc' }}
+          conversionRate={null}
           unapprovedMessagesCount={2}
         />,
         store,
@@ -256,19 +219,11 @@ describe('Signature Request Component', () => {
       };
       const { container } = renderWithProvider(
         <SignatureRequest
-          hardwareWalletRequiresConnection={false}
-          clearConfirmTransaction={() => undefined}
-          cancel={() => undefined}
-          cancelAll={() => undefined}
-          mostRecentOverviewPage="/"
-          showRejectTransactionsConfirmationModal={() => undefined}
-          history={{ push: '/' }}
-          sign={() => undefined}
+          {...baseProps}
           txData={{
             msgParams,
           }}
-          fromAccount={{ address: fromAddress }}
-          provider={{ type: 'rpc' }}
+          conversionRate={null}
           unapprovedMessagesCount={2}
         />,
         store,
@@ -289,19 +244,11 @@ describe('Signature Request Component', () => {
       };
       const { getByText } = renderWithProvider(
         <SignatureRequest
-          hardwareWalletRequiresConnection={false}
-          clearConfirmTransaction={() => undefined}
-          cancel={() => undefined}
-          cancelAll={() => undefined}
-          mostRecentOverviewPage="/"
-          showRejectTransactionsConfirmationModal={() => undefined}
-          history={{ push: '/' }}
-          sign={() => undefined}
+          {...baseProps}
           txData={{
             msgParams,
           }}
-          fromAccount={{ address: fromAddress }}
-          provider={{ type: 'rpc' }}
+          conversionRate={null}
           unapprovedMessagesCount={2}
         />,
         store,
diff --git a/ui/components/app/signature-request/signature-request.container.js b/ui/components/app/signature-request/signature-request.container.js
index a9308197a..7ae2b786f 100644
--- a/ui/components/app/signature-request/signature-request.container.js
+++ b/ui/components/app/signature-request/signature-request.container.js
@@ -9,6 +9,7 @@ import {
   getTotalUnapprovedMessagesCount,
   getCurrentCurrency,
   getPreferences,
+  conversionRateSelector,
 } from '../../../selectors';
 import {
   isAddressLedger,
@@ -53,7 +54,9 @@ function mapStateToProps(state, ownProps) {
     mostRecentOverviewPage: getMostRecentOverviewPage(state),
     nativeCurrency: getNativeCurrency(state),
     currentCurrency: getCurrentCurrency(state),
-    useNativeCurrencyAsPrimaryCurrency,
+    conversionRate: useNativeCurrencyAsPrimaryCurrency
+      ? null
+      : conversionRateSelector(state),
     subjectMetadata: getSubjectMetadata(state),
     // not forwarded to component
     allAccounts: accountsWithSendEtherInfoSelector(state),
@@ -91,7 +94,7 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
     siteImage,
     nativeCurrency,
     currentCurrency,
-    useNativeCurrencyAsPrimaryCurrency,
+    conversionRate,
     provider,
     subjectMetadata,
     unconfirmedMessagesList,
@@ -145,7 +148,7 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
     siteImage,
     nativeCurrency,
     currentCurrency,
-    useNativeCurrencyAsPrimaryCurrency,
+    conversionRate,
     provider,
     subjectMetadata,
     unapprovedMessagesCount,
diff --git a/ui/components/app/signature-request/signature-request.container.test.js b/ui/components/app/signature-request/signature-request.container.test.js
index 8e3411b86..13579552c 100644
--- a/ui/components/app/signature-request/signature-request.container.test.js
+++ b/ui/components/app/signature-request/signature-request.container.test.js
@@ -5,73 +5,82 @@ import configureMockStore from 'redux-mock-store';
 import { renderWithProvider } from '../../../../test/lib/render-helpers';
 import SignatureRequest from './signature-request.container';
 
-describe('Signature Request', () => {
-  const mockStore = {
-    metamask: {
-      tokenList: {
-        '0x514910771af9ca656af840dff83e8264ecf986ca': {
-          address: '0x514910771af9ca656af840dff83e8264ecf986ca',
-          symbol: 'LINK',
-          decimals: 18,
-          name: 'ChainLink Token',
-          iconUrl:
-            'https://crypto.com/price/coin-data/icon/LINK/color_icon.png',
-          aggregators: [
-            'Aave',
-            'Bancor',
-            'CMC',
-            'Crypto.com',
-            'CoinGecko',
-            '1inch',
-            'Paraswap',
-            'PMM',
-            'Zapper',
-            'Zerion',
-            '0x',
-          ],
-          occurrences: 12,
-          unlisted: false,
-        },
+const mockStoreWithEth = {
+  metamask: {
+    tokenList: {
+      '0x514910771af9ca656af840dff83e8264ecf986ca': {
+        address: '0x514910771af9ca656af840dff83e8264ecf986ca',
+        symbol: 'LINK',
+        decimals: 18,
+        name: 'ChainLink Token',
+        iconUrl: 'https://crypto.com/price/coin-data/icon/LINK/color_icon.png',
+        aggregators: [
+          'Aave',
+          'Bancor',
+          'CMC',
+          'Crypto.com',
+          'CoinGecko',
+          '1inch',
+          'Paraswap',
+          'PMM',
+          'Zapper',
+          'Zerion',
+          '0x',
+        ],
+        occurrences: 12,
+        unlisted: false,
       },
-      identities: {
-        '0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e': {
-          name: 'Account 2',
-          address: '0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e',
-        },
-      },
-      addressBook: {
-        undefined: {
-          0: {
-            address: '0x39a4e4Af7cCB654dB9500F258c64781c8FbD39F0',
-            name: '',
-            isEns: false,
-          },
-        },
-      },
-      provider: {
-        type: 'rpc',
-      },
-      preferences: {
-        useNativeCurrencyAsPrimaryCurrency: true,
-      },
-      accounts: {
-        '0xd8f6a2ffb0fc5952d16c9768b71cfd35b6399aa5': {
-          address: '0xd8f6a2ffb0fc5952d16c9768b71cfd35b6399aa5',
-          balance: '0x03',
-        },
-      },
-      cachedBalances: {},
-      unapprovedDecryptMsgs: {},
-      unapprovedEncryptionPublicKeyMsgs: {},
-      uncofirmedTransactions: {},
-      selectedAddress: '0xd8f6a2ffb0fc5952d16c9768b71cfd35b6399aa5',
     },
-  };
-  const store = configureMockStore()(mockStore);
+    identities: {
+      '0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e': {
+        name: 'Account 2',
+        address: '0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e',
+      },
+    },
+    addressBook: {
+      undefined: {
+        0: {
+          address: '0x39a4e4Af7cCB654dB9500F258c64781c8FbD39F0',
+          name: '',
+          isEns: false,
+        },
+      },
+    },
+    provider: {
+      type: 'rpc',
+    },
+    preferences: {
+      useNativeCurrencyAsPrimaryCurrency: true,
+    },
+    accounts: {
+      '0xd8f6a2ffb0fc5952d16c9768b71cfd35b6399aa5': {
+        address: '0xd8f6a2ffb0fc5952d16c9768b71cfd35b6399aa5',
+        balance: '0x03',
+      },
+    },
+    cachedBalances: {},
+    unapprovedDecryptMsgs: {},
+    unapprovedEncryptionPublicKeyMsgs: {},
+    uncofirmedTransactions: {},
+    selectedAddress: '0xd8f6a2ffb0fc5952d16c9768b71cfd35b6399aa5',
+    nativeCurrency: 'ETH',
+    currentCurrency: 'usd',
+    conversionRate: 231.06,
+  },
+};
 
-  const props = {
+const mockStoreWithFiat = {
+  ...mockStoreWithEth,
+  preferences: {
+    useNativeCurrencyAsPrimaryCurrency: false,
+  },
+};
+describe('Signature Request', () => {
+  const propsWithEth = {
     fromAccount: {
       address: '0xd8f6a2ffb0fc5952d16c9768b71cfd35b6399aa5',
+      balance: '0x346ba7725f412cbfdb',
+      name: 'John Doe',
     },
     history: {
       push: sinon.spy(),
@@ -99,76 +108,121 @@ describe('Signature Request', () => {
       time: 1,
       type: 'eth_sign',
     },
+    nativeCurrency: 'ETH',
+    currentCurrency: 'usd',
+    conversionRate: null,
   };
 
-  let rerender;
+  const propsWithFiat = {
+    ...propsWithEth,
+    conversionRate: 156.72,
+  };
 
-  beforeEach(() => {
-    rerender = renderWithProvider(
-      <SignatureRequest.WrappedComponent {...props} />,
-      store,
-    ).rerender;
+  describe('Render with different currencies', () => {
+    it('should render balance with ETH when conversionRate is not provided', () => {
+      const store = configureMockStore()(mockStoreWithEth);
+      renderWithProvider(
+        <SignatureRequest.WrappedComponent {...propsWithEth} />,
+        store,
+      );
+      expect(
+        screen.getByTestId('request-signature-account').textContent,
+      ).toMatchInlineSnapshot(
+        `"UUnknown private networkJohn DoeBalance966.987986 ETH"`,
+      );
+    });
+
+    it('should render balance with fiat when conversionRate not provided', () => {
+      const store = configureMockStore()(mockStoreWithFiat);
+      renderWithProvider(
+        <SignatureRequest.WrappedComponent {...propsWithFiat} />,
+        store,
+      );
+      expect(
+        screen.getByTestId('request-signature-account').textContent,
+      ).toMatchInlineSnapshot(
+        `"UUnknown private networkJohn DoeBalance$151,546.36 USD"`,
+      );
+    });
   });
 
-  afterEach(() => {
-    props.clearConfirmTransaction.resetHistory();
+  describe('functionality check', () => {
+    beforeEach(() => {
+      const store = configureMockStore()(mockStoreWithFiat);
+      renderWithProvider(
+        <SignatureRequest.WrappedComponent {...propsWithFiat} />,
+        store,
+      );
+    });
+
+    afterEach(() => {
+      propsWithFiat.clearConfirmTransaction.resetHistory();
+    });
+
+    it('cancel', () => {
+      const cancelButton = screen.getByTestId('page-container-footer-cancel');
+      fireEvent.click(cancelButton);
+      expect(propsWithFiat.cancel.calledOnce).toStrictEqual(true);
+    });
+
+    it('sign', () => {
+      const signButton = screen.getByTestId('page-container-footer-next');
+      fireEvent.click(signButton);
+      expect(propsWithFiat.sign.calledOnce).toStrictEqual(true);
+    });
+
+    it('cancelAll', () => {
+      const cancelAll = screen.getByTestId('signature-request-reject-all');
+      fireEvent.click(cancelAll);
+      expect(propsWithFiat.cancelAll.calledOnce).toStrictEqual(false);
+    });
+
+    it('have user warning', () => {
+      const warningText = screen.getByText(
+        'Only sign this message if you fully understand the content and trust the requesting site.',
+      );
+
+      expect(warningText).toBeInTheDocument();
+    });
   });
 
-  it('cancel', () => {
-    const cancelButton = screen.getByTestId('page-container-footer-cancel');
+  describe('contract details', () => {
+    let store;
+    beforeEach(() => {
+      store = configureMockStore()(mockStoreWithFiat);
+    });
+    it('shows verify contract details link when verifyingContract is set', () => {
+      renderWithProvider(
+        <SignatureRequest.WrappedComponent {...propsWithFiat} />,
+        store,
+      );
+      const verifyingContractLink = screen.getByTestId(
+        'verify-contract-details',
+      );
+      expect(verifyingContractLink).toBeInTheDocument();
+    });
 
-    fireEvent.click(cancelButton);
+    it('should not show verify contract details link when verifyingContract is not set', () => {
+      const newData = JSON.parse(propsWithFiat.txData.msgParams.data);
+      delete newData.domain.verifyingContract;
 
-    expect(props.cancel.calledOnce).toStrictEqual(true);
-  });
-
-  it('sign', () => {
-    const signButton = screen.getByTestId('page-container-footer-next');
-
-    fireEvent.click(signButton);
-
-    expect(props.sign.calledOnce).toStrictEqual(true);
-  });
-
-  it('cancelAll', () => {
-    const cancelAll = screen.getByTestId('signature-request-reject-all');
-
-    fireEvent.click(cancelAll);
-
-    expect(props.cancelAll.calledOnce).toStrictEqual(false);
-  });
-
-  it('have user warning', () => {
-    const warningText = screen.getByText(
-      'Only sign this message if you fully understand the content and trust the requesting site.',
-    );
-
-    expect(warningText).toBeInTheDocument();
-  });
-
-  it('shows verify contract details link when verifyingContract is set', () => {
-    const verifyingContractLink = screen.getByTestId('verify-contract-details');
-
-    expect(verifyingContractLink).toBeInTheDocument();
-  });
-
-  it('does not show verify contract details link when verifyingContract is not set', () => {
-    const newData = JSON.parse(props.txData.msgParams.data);
-    delete newData.domain.verifyingContract;
-
-    const newProps = {
-      ...props,
-      txData: {
-        ...props.txData,
-        msgParams: {
-          ...props.txData.msgParams,
-          data: JSON.stringify(newData),
+      const newProps = {
+        ...propsWithFiat,
+        txData: {
+          ...propsWithFiat.txData,
+          msgParams: {
+            ...propsWithFiat.txData.msgParams,
+            data: JSON.stringify(newData),
+          },
         },
-      },
-    };
+      };
 
-    rerender(<SignatureRequest.WrappedComponent {...newProps} />, store);
+      renderWithProvider(
+        <SignatureRequest.WrappedComponent {...newProps} />,
+        store,
+      );
 
-    expect(screen.queryByTestId('verify-contract-details')).toBeNull();
+      expect(screen.queryByTestId('verify-contract-details')).toBeNull();
+    });
   });
 });
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
new file mode 100644
index 000000000..de5d14adb
--- /dev/null
+++ b/ui/pages/confirm-decrypt-message/__snapshots__/confirm-decrypt-message.component.test.js.snap
@@ -0,0 +1,531 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ConfirmDecryptMessage Component should match snapshot when preference is ETH currency 1`] = `
+<div>
+  <div
+    class="request-decrypt-message__container"
+  >
+    <div
+      class="request-decrypt-message__header"
+    >
+      <div
+        class="request-decrypt-message__header-background"
+      />
+      <div
+        class="request-decrypt-message__header__text"
+      >
+        Decrypt request
+      </div>
+      <div
+        class="request-decrypt-message__header__tip-container"
+      >
+        <div
+          class="request-decrypt-message__header__tip"
+        />
+      </div>
+    </div>
+    <div
+      class="request-decrypt-message__body"
+    >
+      <div
+        class="request-decrypt-message__account-info"
+      >
+        <div
+          class="request-decrypt-message__account"
+        >
+          <div
+            class="request-decrypt-message__account-text"
+          >
+            Account:
+          </div>
+          <div
+            class="request-decrypt-message__account-item"
+          >
+            <div
+              class="account-list-item undefined"
+              data-testid="account-list-item"
+            >
+              <div
+                class="account-list-item__top-row"
+              >
+                <div
+                  class=""
+                >
+                  <div
+                    class="identicon account-list-item__identicon"
+                    style="height: 18px; width: 18px; border-radius: 9px;"
+                  >
+                    <div
+                      style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 18px; height: 18px; display: inline-block; background: rgb(245, 228, 0);"
+                    >
+                      <svg
+                        height="18"
+                        width="18"
+                        x="0"
+                        y="0"
+                      >
+                        <rect
+                          fill="#F2BE02"
+                          height="18"
+                          transform="translate(3.0840328880287724 -2.9223901886104127) rotate(387.1 9 9)"
+                          width="18"
+                          x="0"
+                          y="0"
+                        />
+                        <rect
+                          fill="#01778E"
+                          height="18"
+                          transform="translate(-1.465568967274283 9.396341018731759) rotate(227.4 9 9)"
+                          width="18"
+                          x="0"
+                          y="0"
+                        />
+                        <rect
+                          fill="#C81435"
+                          height="18"
+                          transform="translate(10.107951098008673 -7.083365091692127) rotate(422.3 9 9)"
+                          width="18"
+                          x="0"
+                          y="0"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="account-list-item__account-name"
+                >
+                  Antonio
+                </div>
+                <div
+                  class="account-mismatch-warning__tooltip-wrapper"
+                >
+                  <div
+                    aria-describedby="tippy-tooltip-1"
+                    class="account-mismatch-warning__tooltip-container"
+                    data-original-title="null"
+                    data-tooltipped=""
+                    style="display: inline;"
+                    tabindex="0"
+                  >
+                    <div
+                      class="account-mismatch-warning__tooltip-container-icon"
+                    >
+                      <svg
+                        class="info-icon info-icon--warning"
+                        height="16"
+                        viewBox="0 0 16 16"
+                        width="16"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M7.2 5.6H8.8V4H7.2V5.6ZM8 14.4C4.472 14.4 1.6 11.528 1.6 8C1.6 4.472 4.472 1.6 8 1.6C11.528 1.6 14.4 4.472 14.4 8C14.4 11.528 11.528 14.4 8 14.4ZM8 0C6.94943 0 5.90914 0.206926 4.93853 0.608964C3.96793 1.011 3.08601 1.60028 2.34315 2.34315C0.842855 3.84344 0 5.87827 0 8C0 10.1217 0.842855 12.1566 2.34315 13.6569C3.08601 14.3997 3.96793 14.989 4.93853 15.391C5.90914 15.7931 6.94943 16 8 16C10.1217 16 12.1566 15.1571 13.6569 13.6569C15.1571 12.1566 16 10.1217 16 8C16 6.94943 15.7931 5.90914 15.391 4.93853C14.989 3.96793 14.3997 3.08601 13.6569 2.34315C12.914 1.60028 12.0321 1.011 11.0615 0.608964C10.0909 0.206926 9.05058 0 8 0ZM7.2 12H8.8V7.2H7.2V12Z"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div
+          class="request-decrypt-message__request-icon"
+        >
+          <div
+            class=""
+          >
+            <div
+              class="identicon"
+              style="height: 40px; width: 40px; border-radius: 20px;"
+            >
+              <div
+                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 40px; height: 40px; display: inline-block; background: rgb(245, 228, 0);"
+              >
+                <svg
+                  height="40"
+                  width="40"
+                  x="0"
+                  y="0"
+                >
+                  <rect
+                    fill="#F2BE02"
+                    height="40"
+                    transform="translate(6.853406417841717 -6.49420041913425) rotate(387.1 20 20)"
+                    width="40"
+                    x="0"
+                    y="0"
+                  />
+                  <rect
+                    fill="#01778E"
+                    height="40"
+                    transform="translate(-3.2568199272761853 20.88075781940391) rotate(227.4 20 20)"
+                    width="40"
+                    x="0"
+                    y="0"
+                  />
+                  <rect
+                    fill="#C81435"
+                    height="40"
+                    transform="translate(22.462113551130386 -15.740811314871396) rotate(422.3 20 20)"
+                    width="40"
+                    x="0"
+                    y="0"
+                  />
+                </svg>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div
+          class="request-decrypt-message__balance"
+        >
+          <div
+            class="request-decrypt-message__balance-text"
+          >
+            Balance:
+          </div>
+          <div
+            class="request-decrypt-message__balance-value"
+          >
+            966.987986 ABC
+          </div>
+        </div>
+      </div>
+      <div
+        class="request-decrypt-message__visual"
+      >
+        <section>
+          <i
+            class="request-decrypt-message__visual-identicon--default"
+          >
+            T
+          </i>
+          <div
+            class="request-decrypt-message__notice"
+          >
+            test would like to read this message to complete your action
+          </div>
+        </section>
+      </div>
+      <div
+        class="request-decrypt-message__message"
+      >
+        <div
+          class="request-decrypt-message__message-text"
+        >
+          {"domain":{"chainId":97,"name":"Ether Mail","verifyingContract":"0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC","version":"1"},"message":{"contents":"Hello, Bob!","from":{"name":"Cow","wallets":["0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826","0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF"]},"to":[{"name":"Bob","wallets":["0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB","0xB0BdaBea57B0BDABeA57b0bdABEA57b0BDabEa57","0xB0B0b0b0b0b0B000000000000000000000000000"]}]},"primaryType":"Mail","types":{"EIP712Domain":[{"name":"name","type":"string"},{"name":"version","type":"string"},{"name":"chainId","type":"uint256"},{"name":"verifyingContract","type":"address"}],"Mail":[{"name":"from","type":"Person"},{"name":"to","type":"Person[]"},{"name":"contents","type":"string"}],"Person":[{"name":"name","type":"string"},{"name":"wallets","type":"address[]"}]}}
+          
+        </div>
+        <div
+          class="request-decrypt-message__message-cover"
+        />
+        <div
+          class="request-decrypt-message__message-lock"
+        >
+          <div
+            class="request-decrypt-message__message-lock__container"
+          >
+            <i
+              class="fa fa-lock fa-lg request-decrypt-message__message-lock__container__icon"
+            />
+            <div
+              class="request-decrypt-message__message-lock__container__text"
+            >
+              Decrypt message
+            </div>
+          </div>
+        </div>
+      </div>
+      <div />
+    </div>
+    <div
+      class="page-container__footer"
+    >
+      <footer>
+        <button
+          class="button btn--rounded btn-secondary page-container__footer-button page-container__footer-button__cancel"
+          data-testid="page-container-footer-cancel"
+          role="button"
+          tabindex="0"
+        >
+          Cancel
+        </button>
+        <button
+          class="button btn--rounded btn-primary page-container__footer-button"
+          data-testid="page-container-footer-next"
+          role="button"
+          tabindex="0"
+        >
+          Decrypt
+        </button>
+      </footer>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`ConfirmDecryptMessage Component should match snapshot when preference is Fiat currency 1`] = `
+<div>
+  <div
+    class="request-decrypt-message__container"
+  >
+    <div
+      class="request-decrypt-message__header"
+    >
+      <div
+        class="request-decrypt-message__header-background"
+      />
+      <div
+        class="request-decrypt-message__header__text"
+      >
+        Decrypt request
+      </div>
+      <div
+        class="request-decrypt-message__header__tip-container"
+      >
+        <div
+          class="request-decrypt-message__header__tip"
+        />
+      </div>
+    </div>
+    <div
+      class="request-decrypt-message__body"
+    >
+      <div
+        class="request-decrypt-message__account-info"
+      >
+        <div
+          class="request-decrypt-message__account"
+        >
+          <div
+            class="request-decrypt-message__account-text"
+          >
+            Account:
+          </div>
+          <div
+            class="request-decrypt-message__account-item"
+          >
+            <div
+              class="account-list-item undefined"
+              data-testid="account-list-item"
+            >
+              <div
+                class="account-list-item__top-row"
+              >
+                <div
+                  class=""
+                >
+                  <div
+                    class="identicon account-list-item__identicon"
+                    style="height: 18px; width: 18px; border-radius: 9px;"
+                  >
+                    <div
+                      style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 18px; height: 18px; display: inline-block; background: rgb(245, 228, 0);"
+                    >
+                      <svg
+                        height="18"
+                        width="18"
+                        x="0"
+                        y="0"
+                      >
+                        <rect
+                          fill="#F2BE02"
+                          height="18"
+                          transform="translate(3.0840328880287724 -2.9223901886104127) rotate(387.1 9 9)"
+                          width="18"
+                          x="0"
+                          y="0"
+                        />
+                        <rect
+                          fill="#01778E"
+                          height="18"
+                          transform="translate(-1.465568967274283 9.396341018731759) rotate(227.4 9 9)"
+                          width="18"
+                          x="0"
+                          y="0"
+                        />
+                        <rect
+                          fill="#C81435"
+                          height="18"
+                          transform="translate(10.107951098008673 -7.083365091692127) rotate(422.3 9 9)"
+                          width="18"
+                          x="0"
+                          y="0"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="account-list-item__account-name"
+                >
+                  Antonio
+                </div>
+                <div
+                  class="account-mismatch-warning__tooltip-wrapper"
+                >
+                  <div
+                    aria-describedby="tippy-tooltip-2"
+                    class="account-mismatch-warning__tooltip-container"
+                    data-original-title="null"
+                    data-tooltipped=""
+                    style="display: inline;"
+                    tabindex="0"
+                  >
+                    <div
+                      class="account-mismatch-warning__tooltip-container-icon"
+                    >
+                      <svg
+                        class="info-icon info-icon--warning"
+                        height="16"
+                        viewBox="0 0 16 16"
+                        width="16"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M7.2 5.6H8.8V4H7.2V5.6ZM8 14.4C4.472 14.4 1.6 11.528 1.6 8C1.6 4.472 4.472 1.6 8 1.6C11.528 1.6 14.4 4.472 14.4 8C14.4 11.528 11.528 14.4 8 14.4ZM8 0C6.94943 0 5.90914 0.206926 4.93853 0.608964C3.96793 1.011 3.08601 1.60028 2.34315 2.34315C0.842855 3.84344 0 5.87827 0 8C0 10.1217 0.842855 12.1566 2.34315 13.6569C3.08601 14.3997 3.96793 14.989 4.93853 15.391C5.90914 15.7931 6.94943 16 8 16C10.1217 16 12.1566 15.1571 13.6569 13.6569C15.1571 12.1566 16 10.1217 16 8C16 6.94943 15.7931 5.90914 15.391 4.93853C14.989 3.96793 14.3997 3.08601 13.6569 2.34315C12.914 1.60028 12.0321 1.011 11.0615 0.608964C10.0909 0.206926 9.05058 0 8 0ZM7.2 12H8.8V7.2H7.2V12Z"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div
+          class="request-decrypt-message__request-icon"
+        >
+          <div
+            class=""
+          >
+            <div
+              class="identicon"
+              style="height: 40px; width: 40px; border-radius: 20px;"
+            >
+              <div
+                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 40px; height: 40px; display: inline-block; background: rgb(245, 228, 0);"
+              >
+                <svg
+                  height="40"
+                  width="40"
+                  x="0"
+                  y="0"
+                >
+                  <rect
+                    fill="#F2BE02"
+                    height="40"
+                    transform="translate(6.853406417841717 -6.49420041913425) rotate(387.1 20 20)"
+                    width="40"
+                    x="0"
+                    y="0"
+                  />
+                  <rect
+                    fill="#01778E"
+                    height="40"
+                    transform="translate(-3.2568199272761853 20.88075781940391) rotate(227.4 20 20)"
+                    width="40"
+                    x="0"
+                    y="0"
+                  />
+                  <rect
+                    fill="#C81435"
+                    height="40"
+                    transform="translate(22.462113551130386 -15.740811314871396) rotate(422.3 20 20)"
+                    width="40"
+                    x="0"
+                    y="0"
+                  />
+                </svg>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div
+          class="request-decrypt-message__balance"
+        >
+          <div
+            class="request-decrypt-message__balance-text"
+          >
+            Balance:
+          </div>
+          <div
+            class="request-decrypt-message__balance-value"
+          >
+            1520956.064158 DEF
+          </div>
+        </div>
+      </div>
+      <div
+        class="request-decrypt-message__visual"
+      >
+        <section>
+          <i
+            class="request-decrypt-message__visual-identicon--default"
+          >
+            T
+          </i>
+          <div
+            class="request-decrypt-message__notice"
+          >
+            test would like to read this message to complete your action
+          </div>
+        </section>
+      </div>
+      <div
+        class="request-decrypt-message__message"
+      >
+        <div
+          class="request-decrypt-message__message-text"
+        >
+          {"domain":{"chainId":97,"name":"Ether Mail","verifyingContract":"0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC","version":"1"},"message":{"contents":"Hello, Bob!","from":{"name":"Cow","wallets":["0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826","0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF"]},"to":[{"name":"Bob","wallets":["0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB","0xB0BdaBea57B0BDABeA57b0bdABEA57b0BDabEa57","0xB0B0b0b0b0b0B000000000000000000000000000"]}]},"primaryType":"Mail","types":{"EIP712Domain":[{"name":"name","type":"string"},{"name":"version","type":"string"},{"name":"chainId","type":"uint256"},{"name":"verifyingContract","type":"address"}],"Mail":[{"name":"from","type":"Person"},{"name":"to","type":"Person[]"},{"name":"contents","type":"string"}],"Person":[{"name":"name","type":"string"},{"name":"wallets","type":"address[]"}]}}
+          
+        </div>
+        <div
+          class="request-decrypt-message__message-cover"
+        />
+        <div
+          class="request-decrypt-message__message-lock"
+        >
+          <div
+            class="request-decrypt-message__message-lock__container"
+          >
+            <i
+              class="fa fa-lock fa-lg request-decrypt-message__message-lock__container__icon"
+            />
+            <div
+              class="request-decrypt-message__message-lock__container__text"
+            >
+              Decrypt message
+            </div>
+          </div>
+        </div>
+      </div>
+      <div />
+    </div>
+    <div
+      class="page-container__footer"
+    >
+      <footer>
+        <button
+          class="button btn--rounded btn-secondary page-container__footer-button page-container__footer-button__cancel"
+          data-testid="page-container-footer-cancel"
+          role="button"
+          tabindex="0"
+        >
+          Cancel
+        </button>
+        <button
+          class="button btn--rounded btn-primary page-container__footer-button"
+          data-testid="page-container-footer-next"
+          role="button"
+          tabindex="0"
+        >
+          Decrypt
+        </button>
+      </footer>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.js b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.js
index 6066c7fd0..49e0acb97 100644
--- a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.js
+++ b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.js
@@ -15,6 +15,8 @@ import { Numeric } from '../../../shared/modules/Numeric';
 import { EtherDenomination } from '../../../shared/constants/common';
 import { Icon, ICON_NAMES } from '../../components/component-library';
 import { IconColor } from '../../helpers/constants/design-system';
+import { formatCurrency } from '../../helpers/utils/confirm-tx.util';
+import { getValueFromWeiHex } from '../../../shared/modules/conversion.utils';
 
 export default class ConfirmDecryptMessage extends Component {
   static contextTypes = {
@@ -38,10 +40,11 @@ export default class ConfirmDecryptMessage extends Component {
     txData: PropTypes.object,
     subjectMetadata: PropTypes.object,
     nativeCurrency: PropTypes.string.isRequired,
+    currentCurrency: PropTypes.string.isRequired,
+    conversionRate: PropTypes.number,
   };
 
   state = {
-    fromAccount: this.props.fromAccount,
     copyToClipboardPressed: false,
     hasCopied: false,
   };
@@ -77,7 +80,7 @@ export default class ConfirmDecryptMessage extends Component {
   };
 
   renderAccount = () => {
-    const { fromAccount } = this.state;
+    const { fromAccount } = this.props;
     const { t } = this.context;
 
     return (
@@ -94,20 +97,31 @@ export default class ConfirmDecryptMessage extends Component {
   };
 
   renderBalance = () => {
-    const { nativeCurrency } = this.props;
     const {
+      conversionRate,
+      nativeCurrency,
+      currentCurrency,
       fromAccount: { balance },
-    } = this.state;
+    } = this.props;
     const { t } = this.context;
 
-    const nativeCurrencyBalance = new Numeric(
-      balance,
-      16,
-      EtherDenomination.WEI,
-    )
-      .toDenomination(EtherDenomination.ETH)
-      .round(6)
-      .toBase(10);
+    const nativeCurrencyBalance = conversionRate
+      ? formatCurrency(
+          getValueFromWeiHex({
+            value: balance,
+            fromCurrency: nativeCurrency,
+            toCurrency: currentCurrency,
+            conversionRate,
+            numberOfDecimals: 6,
+            toDenomination: EtherDenomination.ETH,
+          }),
+          currentCurrency,
+        )
+      : new Numeric(balance, 16, EtherDenomination.WEI)
+          .toDenomination(EtherDenomination.ETH)
+          .round(6)
+          .toBase(10)
+          .toString();
 
     return (
       <div className="request-decrypt-message__balance">
@@ -115,7 +129,9 @@ export default class ConfirmDecryptMessage extends Component {
           {`${t('balance')}:`}
         </div>
         <div className="request-decrypt-message__balance-value">
-          {`${nativeCurrencyBalance} ${nativeCurrency}`}
+          {`${nativeCurrencyBalance} ${
+            conversionRate ? currentCurrency?.toUpperCase() : nativeCurrency
+          }`}
         </div>
       </div>
     );
diff --git a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.test.js b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.test.js
new file mode 100644
index 000000000..4939352d2
--- /dev/null
+++ b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.test.js
@@ -0,0 +1,130 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import mockState from '../../../test/data/mock-state.json';
+import { renderWithProvider } from '../../../test/lib/render-helpers';
+import ConfirmDecryptMessage from './confirm-decrypt-message.component';
+
+const messageData = {
+  domain: {
+    chainId: 97,
+    name: 'Ether Mail',
+    verifyingContract: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC',
+    version: '1',
+  },
+  message: {
+    contents: 'Hello, Bob!',
+    from: {
+      name: 'Cow',
+      wallets: [
+        '0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826',
+        '0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF',
+      ],
+    },
+    to: [
+      {
+        name: 'Bob',
+        wallets: [
+          '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB',
+          '0xB0BdaBea57B0BDABeA57b0bdABEA57b0BDabEa57',
+          '0xB0B0b0b0b0b0B000000000000000000000000000',
+        ],
+      },
+    ],
+  },
+  primaryType: 'Mail',
+  types: {
+    EIP712Domain: [
+      { name: 'name', type: 'string' },
+      { name: 'version', type: 'string' },
+      { name: 'chainId', type: 'uint256' },
+      { name: 'verifyingContract', type: 'address' },
+    ],
+    Mail: [
+      { name: 'from', type: 'Person' },
+      { name: 'to', type: 'Person[]' },
+      { name: 'contents', type: 'string' },
+    ],
+    Person: [
+      { name: 'name', type: 'string' },
+      { name: 'wallets', type: 'address[]' },
+    ],
+  },
+};
+const baseProps = {
+  clearConfirmTransaction: () => undefined,
+  cancelDecryptMessage: () => undefined,
+  decryptMessage: () => undefined,
+  decryptMessageInline: () => undefined,
+  mostRecentOverviewPage: '/',
+  history: { push: '/' },
+  requesterAddress: '0x123456789abcdef',
+  txData: {
+    msgParams: {
+      data: JSON.stringify(messageData),
+      version: 'V4',
+      origin: 'test',
+    },
+  },
+  subjectMetadata: {
+    'peepeth.com': {
+      iconUrl: 'https://peepeth.com/favicon-32x32.png',
+      name: 'Peepeth',
+    },
+    'https://remix.ethereum.org': {
+      iconUrl: 'https://remix.ethereum.org/icon.png',
+      name: 'Remix - Ethereum IDE',
+    },
+  },
+  nativeCurrency: 'ABC',
+  currentCurrency: 'def',
+  fromAccount: {
+    address: '0x123456789abcdef',
+    balance: '0x346ba7725f412cbfdb',
+    name: 'Antonio',
+  },
+};
+
+describe('ConfirmDecryptMessage Component', () => {
+  const store = configureMockStore()(mockState);
+
+  it('should match snapshot when preference is ETH currency', () => {
+    const { container } = renderWithProvider(
+      <ConfirmDecryptMessage {...baseProps} conversionRate={null} />,
+      store,
+    );
+
+    expect(container).toMatchSnapshot();
+    expect(
+      container.querySelector('.request-decrypt-message__balance-value')
+        .textContent,
+    ).toMatchInlineSnapshot(`"966.987986 ABC"`);
+  });
+
+  it('should match snapshot when preference is Fiat currency', () => {
+    const { container } = renderWithProvider(
+      <ConfirmDecryptMessage {...baseProps} conversionRate={1572.88} />,
+      store,
+    );
+
+    expect(container).toMatchSnapshot();
+    expect(
+      container.querySelector('.request-decrypt-message__balance-value')
+        .textContent,
+    ).toMatchInlineSnapshot(`"1520956.064158 DEF"`);
+  });
+
+  it('should match snapshot when there is no txData', () => {
+    const newProps = {
+      ...baseProps,
+      txData: null,
+    };
+    const { container } = renderWithProvider(
+      <ConfirmDecryptMessage {...newProps} conversionRate={1572.88} />,
+      store,
+    );
+
+    expect(
+      container.querySelector('.request-decrypt-message__container'),
+    ).toBeNull();
+  });
+});
diff --git a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.container.js b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.container.js
index 4e59137b3..bcd588097 100644
--- a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.container.js
+++ b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.container.js
@@ -9,6 +9,9 @@ import {
   decryptMsgInline,
 } from '../../store/actions';
 import {
+  conversionRateSelector,
+  getCurrentCurrency,
+  getPreferences,
   getTargetAccountWithSendEtherInfo,
   unconfirmedTransactionsListSelector,
 } from '../../selectors';
@@ -22,6 +25,8 @@ function mapStateToProps(state) {
     metamask: { subjectMetadata = {} },
   } = state;
 
+  const { useNativeCurrencyAsPrimaryCurrency } = getPreferences(state);
+
   const unconfirmedTransactions = unconfirmedTransactionsListSelector(state);
 
   const txData = unconfirmedTransactions[0];
@@ -37,8 +42,12 @@ function mapStateToProps(state) {
     fromAccount,
     requester: null,
     requesterAddress: null,
+    conversionRate: useNativeCurrencyAsPrimaryCurrency
+      ? null
+      : conversionRateSelector(state),
     mostRecentOverviewPage: getMostRecentOverviewPage(state),
     nativeCurrency: getNativeCurrency(state),
+    currentCurrency: getCurrentCurrency(state),
   };
 }
 
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
new file mode 100644
index 000000000..683adc6f5
--- /dev/null
+++ b/ui/pages/confirm-encryption-public-key/__snapshots__/confirm-encryption-public-key.component.test.js.snap
@@ -0,0 +1,499 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ConfirmDecryptMessage Component should match snapshot when preference is ETH currency 1`] = `
+<div>
+  <div
+    class="request-encryption-public-key__container"
+  >
+    <div
+      class="request-encryption-public-key__header"
+    >
+      <div
+        class="request-encryption-public-key__header-background"
+      />
+      <div
+        class="request-encryption-public-key__header__text"
+      >
+        Request encryption public key
+      </div>
+      <div
+        class="request-encryption-public-key__header__tip-container"
+      >
+        <div
+          class="request-encryption-public-key__header__tip"
+        />
+      </div>
+    </div>
+    <div
+      class="request-encryption-public-key__body"
+    >
+      <div
+        class="request-encryption-public-key__account-info"
+      >
+        <div
+          class="request-encryption-public-key__account"
+        >
+          <div
+            class="request-encryption-public-key__account-text"
+          >
+            Account:
+          </div>
+          <div
+            class="request-encryption-public-key__account-item"
+          >
+            <div
+              class="account-list-item undefined"
+              data-testid="account-list-item"
+            >
+              <div
+                class="account-list-item__top-row"
+              >
+                <div
+                  class=""
+                >
+                  <div
+                    class="identicon account-list-item__identicon"
+                    style="height: 18px; width: 18px; border-radius: 9px;"
+                  >
+                    <div
+                      style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 18px; height: 18px; display: inline-block; background: rgb(245, 228, 0);"
+                    >
+                      <svg
+                        height="18"
+                        width="18"
+                        x="0"
+                        y="0"
+                      >
+                        <rect
+                          fill="#F2BE02"
+                          height="18"
+                          transform="translate(3.0840328880287724 -2.9223901886104127) rotate(387.1 9 9)"
+                          width="18"
+                          x="0"
+                          y="0"
+                        />
+                        <rect
+                          fill="#01778E"
+                          height="18"
+                          transform="translate(-1.465568967274283 9.396341018731759) rotate(227.4 9 9)"
+                          width="18"
+                          x="0"
+                          y="0"
+                        />
+                        <rect
+                          fill="#C81435"
+                          height="18"
+                          transform="translate(10.107951098008673 -7.083365091692127) rotate(422.3 9 9)"
+                          width="18"
+                          x="0"
+                          y="0"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="account-list-item__account-name"
+                >
+                  Antonio
+                </div>
+                <div
+                  class="account-mismatch-warning__tooltip-wrapper"
+                >
+                  <div
+                    aria-describedby="tippy-tooltip-1"
+                    class="account-mismatch-warning__tooltip-container"
+                    data-original-title="null"
+                    data-tooltipped=""
+                    style="display: inline;"
+                    tabindex="0"
+                  >
+                    <div
+                      class="account-mismatch-warning__tooltip-container-icon"
+                    >
+                      <svg
+                        class="info-icon info-icon--warning"
+                        height="16"
+                        viewBox="0 0 16 16"
+                        width="16"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M7.2 5.6H8.8V4H7.2V5.6ZM8 14.4C4.472 14.4 1.6 11.528 1.6 8C1.6 4.472 4.472 1.6 8 1.6C11.528 1.6 14.4 4.472 14.4 8C14.4 11.528 11.528 14.4 8 14.4ZM8 0C6.94943 0 5.90914 0.206926 4.93853 0.608964C3.96793 1.011 3.08601 1.60028 2.34315 2.34315C0.842855 3.84344 0 5.87827 0 8C0 10.1217 0.842855 12.1566 2.34315 13.6569C3.08601 14.3997 3.96793 14.989 4.93853 15.391C5.90914 15.7931 6.94943 16 8 16C10.1217 16 12.1566 15.1571 13.6569 13.6569C15.1571 12.1566 16 10.1217 16 8C16 6.94943 15.7931 5.90914 15.391 4.93853C14.989 3.96793 14.3997 3.08601 13.6569 2.34315C12.914 1.60028 12.0321 1.011 11.0615 0.608964C10.0909 0.206926 9.05058 0 8 0ZM7.2 12H8.8V7.2H7.2V12Z"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div
+          class="request-encryption-public-key__request-icon"
+        >
+          <div
+            class=""
+          >
+            <div
+              class="identicon"
+              style="height: 40px; width: 40px; border-radius: 20px;"
+            >
+              <div
+                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 40px; height: 40px; display: inline-block; background: rgb(245, 228, 0);"
+              >
+                <svg
+                  height="40"
+                  width="40"
+                  x="0"
+                  y="0"
+                >
+                  <rect
+                    fill="#F2BE02"
+                    height="40"
+                    transform="translate(6.853406417841717 -6.49420041913425) rotate(387.1 20 20)"
+                    width="40"
+                    x="0"
+                    y="0"
+                  />
+                  <rect
+                    fill="#01778E"
+                    height="40"
+                    transform="translate(-3.2568199272761853 20.88075781940391) rotate(227.4 20 20)"
+                    width="40"
+                    x="0"
+                    y="0"
+                  />
+                  <rect
+                    fill="#C81435"
+                    height="40"
+                    transform="translate(22.462113551130386 -15.740811314871396) rotate(422.3 20 20)"
+                    width="40"
+                    x="0"
+                    y="0"
+                  />
+                </svg>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div
+          class="request-encryption-public-key__balance"
+        >
+          <div
+            class="request-encryption-public-key__balance-text"
+          >
+            Balance:
+          </div>
+          <div
+            class="request-encryption-public-key__balance-value"
+          >
+            966.987986 ABC
+          </div>
+        </div>
+      </div>
+      <div
+        class="request-encryption-public-key__visual"
+      >
+        <section>
+          <i
+            class="request-encryption-public-key__visual-identicon--default"
+          >
+            T
+          </i>
+          <div
+            class="request-encryption-public-key__notice"
+          >
+            <span>
+               
+              
+              <div
+                class="site-origin"
+              >
+                <bdi
+                  dir="ltr"
+                >
+                  test
+                </bdi>
+              </div>
+               would like your public encryption key. By consenting, this site will be able to compose encrypted messages to you.
+               
+            </span>
+          </div>
+        </section>
+      </div>
+    </div>
+    <div
+      class="page-container__footer"
+    >
+      <footer>
+        <button
+          class="button btn--rounded btn-secondary page-container__footer-button page-container__footer-button__cancel"
+          data-testid="page-container-footer-cancel"
+          role="button"
+          tabindex="0"
+        >
+          Cancel
+        </button>
+        <button
+          class="button btn--rounded btn-primary page-container__footer-button"
+          data-testid="page-container-footer-next"
+          role="button"
+          tabindex="0"
+        >
+          Provide
+        </button>
+      </footer>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`ConfirmDecryptMessage Component should match snapshot when preference is Fiat currency 1`] = `
+<div>
+  <div
+    class="request-encryption-public-key__container"
+  >
+    <div
+      class="request-encryption-public-key__header"
+    >
+      <div
+        class="request-encryption-public-key__header-background"
+      />
+      <div
+        class="request-encryption-public-key__header__text"
+      >
+        Request encryption public key
+      </div>
+      <div
+        class="request-encryption-public-key__header__tip-container"
+      >
+        <div
+          class="request-encryption-public-key__header__tip"
+        />
+      </div>
+    </div>
+    <div
+      class="request-encryption-public-key__body"
+    >
+      <div
+        class="request-encryption-public-key__account-info"
+      >
+        <div
+          class="request-encryption-public-key__account"
+        >
+          <div
+            class="request-encryption-public-key__account-text"
+          >
+            Account:
+          </div>
+          <div
+            class="request-encryption-public-key__account-item"
+          >
+            <div
+              class="account-list-item undefined"
+              data-testid="account-list-item"
+            >
+              <div
+                class="account-list-item__top-row"
+              >
+                <div
+                  class=""
+                >
+                  <div
+                    class="identicon account-list-item__identicon"
+                    style="height: 18px; width: 18px; border-radius: 9px;"
+                  >
+                    <div
+                      style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 18px; height: 18px; display: inline-block; background: rgb(245, 228, 0);"
+                    >
+                      <svg
+                        height="18"
+                        width="18"
+                        x="0"
+                        y="0"
+                      >
+                        <rect
+                          fill="#F2BE02"
+                          height="18"
+                          transform="translate(3.0840328880287724 -2.9223901886104127) rotate(387.1 9 9)"
+                          width="18"
+                          x="0"
+                          y="0"
+                        />
+                        <rect
+                          fill="#01778E"
+                          height="18"
+                          transform="translate(-1.465568967274283 9.396341018731759) rotate(227.4 9 9)"
+                          width="18"
+                          x="0"
+                          y="0"
+                        />
+                        <rect
+                          fill="#C81435"
+                          height="18"
+                          transform="translate(10.107951098008673 -7.083365091692127) rotate(422.3 9 9)"
+                          width="18"
+                          x="0"
+                          y="0"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="account-list-item__account-name"
+                >
+                  Antonio
+                </div>
+                <div
+                  class="account-mismatch-warning__tooltip-wrapper"
+                >
+                  <div
+                    aria-describedby="tippy-tooltip-2"
+                    class="account-mismatch-warning__tooltip-container"
+                    data-original-title="null"
+                    data-tooltipped=""
+                    style="display: inline;"
+                    tabindex="0"
+                  >
+                    <div
+                      class="account-mismatch-warning__tooltip-container-icon"
+                    >
+                      <svg
+                        class="info-icon info-icon--warning"
+                        height="16"
+                        viewBox="0 0 16 16"
+                        width="16"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M7.2 5.6H8.8V4H7.2V5.6ZM8 14.4C4.472 14.4 1.6 11.528 1.6 8C1.6 4.472 4.472 1.6 8 1.6C11.528 1.6 14.4 4.472 14.4 8C14.4 11.528 11.528 14.4 8 14.4ZM8 0C6.94943 0 5.90914 0.206926 4.93853 0.608964C3.96793 1.011 3.08601 1.60028 2.34315 2.34315C0.842855 3.84344 0 5.87827 0 8C0 10.1217 0.842855 12.1566 2.34315 13.6569C3.08601 14.3997 3.96793 14.989 4.93853 15.391C5.90914 15.7931 6.94943 16 8 16C10.1217 16 12.1566 15.1571 13.6569 13.6569C15.1571 12.1566 16 10.1217 16 8C16 6.94943 15.7931 5.90914 15.391 4.93853C14.989 3.96793 14.3997 3.08601 13.6569 2.34315C12.914 1.60028 12.0321 1.011 11.0615 0.608964C10.0909 0.206926 9.05058 0 8 0ZM7.2 12H8.8V7.2H7.2V12Z"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div
+          class="request-encryption-public-key__request-icon"
+        >
+          <div
+            class=""
+          >
+            <div
+              class="identicon"
+              style="height: 40px; width: 40px; border-radius: 20px;"
+            >
+              <div
+                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 40px; height: 40px; display: inline-block; background: rgb(245, 228, 0);"
+              >
+                <svg
+                  height="40"
+                  width="40"
+                  x="0"
+                  y="0"
+                >
+                  <rect
+                    fill="#F2BE02"
+                    height="40"
+                    transform="translate(6.853406417841717 -6.49420041913425) rotate(387.1 20 20)"
+                    width="40"
+                    x="0"
+                    y="0"
+                  />
+                  <rect
+                    fill="#01778E"
+                    height="40"
+                    transform="translate(-3.2568199272761853 20.88075781940391) rotate(227.4 20 20)"
+                    width="40"
+                    x="0"
+                    y="0"
+                  />
+                  <rect
+                    fill="#C81435"
+                    height="40"
+                    transform="translate(22.462113551130386 -15.740811314871396) rotate(422.3 20 20)"
+                    width="40"
+                    x="0"
+                    y="0"
+                  />
+                </svg>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div
+          class="request-encryption-public-key__balance"
+        >
+          <div
+            class="request-encryption-public-key__balance-text"
+          >
+            Balance:
+          </div>
+          <div
+            class="request-encryption-public-key__balance-value"
+          >
+            1520956.064158 DEF
+          </div>
+        </div>
+      </div>
+      <div
+        class="request-encryption-public-key__visual"
+      >
+        <section>
+          <i
+            class="request-encryption-public-key__visual-identicon--default"
+          >
+            T
+          </i>
+          <div
+            class="request-encryption-public-key__notice"
+          >
+            <span>
+               
+              
+              <div
+                class="site-origin"
+              >
+                <bdi
+                  dir="ltr"
+                >
+                  test
+                </bdi>
+              </div>
+               would like your public encryption key. By consenting, this site will be able to compose encrypted messages to you.
+               
+            </span>
+          </div>
+        </section>
+      </div>
+    </div>
+    <div
+      class="page-container__footer"
+    >
+      <footer>
+        <button
+          class="button btn--rounded btn-secondary page-container__footer-button page-container__footer-button__cancel"
+          data-testid="page-container-footer-cancel"
+          role="button"
+          tabindex="0"
+        >
+          Cancel
+        </button>
+        <button
+          class="button btn--rounded btn-primary page-container__footer-button"
+          data-testid="page-container-footer-next"
+          role="button"
+          tabindex="0"
+        >
+          Provide
+        </button>
+      </footer>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js
index 1ef3a9260..262fd2958 100644
--- a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js
+++ b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js
@@ -10,6 +10,8 @@ import { EVENT } from '../../../shared/constants/metametrics';
 import SiteOrigin from '../../components/ui/site-origin';
 import { Numeric } from '../../../shared/modules/Numeric';
 import { EtherDenomination } from '../../../shared/constants/common';
+import { formatCurrency } from '../../helpers/utils/confirm-tx.util';
+import { getValueFromWeiHex } from '../../../shared/modules/conversion.utils';
 
 export default class ConfirmEncryptionPublicKey extends Component {
   static contextTypes = {
@@ -32,6 +34,8 @@ export default class ConfirmEncryptionPublicKey extends Component {
     subjectMetadata: PropTypes.object,
     mostRecentOverviewPage: PropTypes.string.isRequired,
     nativeCurrency: PropTypes.string.isRequired,
+    currentCurrency: PropTypes.string.isRequired,
+    conversionRate: PropTypes.number,
   };
 
   renderHeader = () => {
@@ -69,19 +73,30 @@ export default class ConfirmEncryptionPublicKey extends Component {
 
   renderBalance = () => {
     const {
+      conversionRate,
       nativeCurrency,
+      currentCurrency,
       fromAccount: { balance },
     } = this.props;
     const { t } = this.context;
 
-    const nativeCurrencyBalance = new Numeric(
-      balance,
-      16,
-      EtherDenomination.WEI,
-    )
-      .toDenomination(EtherDenomination.ETH)
-      .round(6)
-      .toBase(10);
+    const nativeCurrencyBalance = conversionRate
+      ? formatCurrency(
+          getValueFromWeiHex({
+            value: balance,
+            fromCurrency: nativeCurrency,
+            toCurrency: currentCurrency,
+            conversionRate,
+            numberOfDecimals: 6,
+            toDenomination: EtherDenomination.ETH,
+          }),
+          currentCurrency,
+        )
+      : new Numeric(balance, 16, EtherDenomination.WEI)
+          .toDenomination(EtherDenomination.ETH)
+          .round(6)
+          .toBase(10)
+          .toString();
 
     return (
       <div className="request-encryption-public-key__balance">
@@ -89,7 +104,9 @@ export default class ConfirmEncryptionPublicKey extends Component {
           {`${t('balance')}:`}
         </div>
         <div className="request-encryption-public-key__balance-value">
-          {`${nativeCurrencyBalance} ${nativeCurrency}`}
+          {`${nativeCurrencyBalance} ${
+            conversionRate ? currentCurrency?.toUpperCase() : nativeCurrency
+          }`}
         </div>
       </div>
     );
diff --git a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.test.js b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.test.js
new file mode 100644
index 000000000..4d84fbbf6
--- /dev/null
+++ b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.test.js
@@ -0,0 +1,79 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import mockState from '../../../test/data/mock-state.json';
+import { renderWithProvider } from '../../../test/lib/render-helpers';
+import ConfirmEncryptionPublicKey from './confirm-encryption-public-key.component';
+
+const baseProps = {
+  clearConfirmTransaction: () => undefined,
+  cancelEncryptionPublicKey: () => undefined,
+  encryptionPublicKey: () => undefined,
+  mostRecentOverviewPage: '/',
+  history: { push: '/' },
+  requesterAddress: '0x123456789abcdef',
+  txData: {
+    origin: 'test',
+  },
+  subjectMetadata: {
+    'peepeth.com': {
+      iconUrl: 'https://peepeth.com/favicon-32x32.png',
+      name: 'Peepeth',
+    },
+    'https://remix.ethereum.org': {
+      iconUrl: 'https://remix.ethereum.org/icon.png',
+      name: 'Remix - Ethereum IDE',
+    },
+  },
+  nativeCurrency: 'ABC',
+  currentCurrency: 'def',
+  fromAccount: {
+    address: '0x123456789abcdef',
+    balance: '0x346ba7725f412cbfdb',
+    name: 'Antonio',
+  },
+};
+
+describe('ConfirmDecryptMessage Component', () => {
+  const store = configureMockStore()(mockState);
+
+  it('should match snapshot when preference is ETH currency', () => {
+    const { container } = renderWithProvider(
+      <ConfirmEncryptionPublicKey {...baseProps} conversionRate={null} />,
+      store,
+    );
+
+    expect(container).toMatchSnapshot();
+    expect(
+      container.querySelector('.request-encryption-public-key__balance-value')
+        .textContent,
+    ).toMatchInlineSnapshot(`"966.987986 ABC"`);
+  });
+
+  it('should match snapshot when preference is Fiat currency', () => {
+    const { container } = renderWithProvider(
+      <ConfirmEncryptionPublicKey {...baseProps} conversionRate={1572.88} />,
+      store,
+    );
+
+    expect(container).toMatchSnapshot();
+    expect(
+      container.querySelector('.request-encryption-public-key__balance-value')
+        .textContent,
+    ).toMatchInlineSnapshot(`"1520956.064158 DEF"`);
+  });
+
+  it('should match snapshot when there is no txData', () => {
+    const newProps = {
+      ...baseProps,
+      txData: null,
+    };
+    const { container } = renderWithProvider(
+      <ConfirmEncryptionPublicKey {...newProps} conversionRate={1572.88} />,
+      store,
+    );
+
+    expect(
+      container.querySelector('.request-decrypt-message__container'),
+    ).toBeNull();
+  });
+});
diff --git a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js
index 554ba41fd..489d7d088 100644
--- a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js
+++ b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js
@@ -9,8 +9,11 @@ import {
 } from '../../store/actions';
 
 import {
+  conversionRateSelector,
   unconfirmedTransactionsListSelector,
   getTargetAccountWithSendEtherInfo,
+  getPreferences,
+  getCurrentCurrency,
 } from '../../selectors';
 
 import { clearConfirmTransaction } from '../../ducks/confirm-transaction/confirm-transaction.duck';
@@ -23,6 +26,8 @@ function mapStateToProps(state) {
     metamask: { subjectMetadata = {} },
   } = state;
 
+  const { useNativeCurrencyAsPrimaryCurrency } = getPreferences(state);
+
   const unconfirmedTransactions = unconfirmedTransactionsListSelector(state);
 
   const txData = unconfirmedTransactions[0];
@@ -38,8 +43,12 @@ function mapStateToProps(state) {
     fromAccount,
     requester: null,
     requesterAddress: null,
+    conversionRate: useNativeCurrencyAsPrimaryCurrency
+      ? null
+      : conversionRateSelector(state),
     mostRecentOverviewPage: getMostRecentOverviewPage(state),
     nativeCurrency: getNativeCurrency(state),
+    currentCurrency: getCurrentCurrency(state),
   };
 }
 
diff --git a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.stories.js b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.stories.js
index 283b32d45..d0ec8f146 100644
--- a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.stories.js
+++ b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.stories.js
@@ -28,6 +28,11 @@ export default {
     encryptionPublicKey: {
       action: 'encryptionPublicKey',
     },
+    conversionRate: {
+      control: {
+        type: 'number',
+      },
+    },
     history: {
       control: {
         type: 'object',
@@ -69,6 +74,8 @@ export default {
     subjectMetadata: metamask.subjectMetadata,
     mostRecentOverviewPage: history.mostRecentOverviewPage,
     nativeCurrency: metamask.nativeCurrency,
+    currentCurrency: metamask.currentCurrency,
+    conversionRate: metamask.conversionRate,
   },
 };
 
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 ab9335e71..e795ab35d 100644
--- a/ui/pages/confirm-signature-request/__snapshots__/index.test.js.snap
+++ b/ui/pages/confirm-signature-request/__snapshots__/index.test.js.snap
@@ -73,6 +73,7 @@ exports[`Signature Request Component render should match snapshot 1`] = `
     </div>
     <div
       class="request-signature__account"
+      data-testid="request-signature-account"
     >
       <div
         class="box network-account-balance-header box--padding-4 box--display-flex box--flex-direction-row box--justify-content-space-between box--align-items-center"

From 7bc2370be5c10b02bf32165435b6d629daba9928 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Wed, 8 Mar 2023 09:35:45 -0800
Subject: [PATCH 29/36] =?UTF-8?q?Use=20tokenList=20to=20get=20token=20deta?=
 =?UTF-8?q?ils,=20when=20available,=20in=20getTokenStanda=E2=80=A6=20(#178?=
 =?UTF-8?q?91)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Use tokenList to get token details, when available, in getTokenStandardAndDetails

Previously, every call to getTokenStandardAndDetails would fetch data via the provider.
This would result in at least 3 network requests whenever that method is called for an
ERC20 token, contributing to unneccesary loading and lagging in multiple places.
This commit takes advantage of stored data we already have available to avoid the unnecessary
loading.

* Lint fix

* Fix build-quote test

* bump coverage targets

* Pass provider to token-util, for use in ethers Contract module

* Check all possible sources of ERC20 token data before async call to assetsContractController

* Add and update tests

* Update app/scripts/metamask-controller.js

Co-authored-by: Alex Donesky <adonesky@gmail.com>

* Update app/scripts/metamask-controller.js

Co-authored-by: Alex Donesky <adonesky@gmail.com>

* Remove unnecessary this.ethQuery changes

* Use metamask-eth-abis instead of human-standard-token-abi in token-util.ts

* Add explanatory comments to getTokenStandardAndDetails

* lint fix

* Cleanup

* fix test

* Update app/scripts/metamask-controller.js

Co-authored-by: Alex Donesky <adonesky@gmail.com>

* update error message

---------

Co-authored-by: Alex Donesky <adonesky@gmail.com>
---
 app/scripts/metamask-controller.js            |  75 +++-
 app/scripts/metamask-controller.test.js       | 338 ++++++++++++++++++
 shared/lib/token-util.ts                      |  37 ++
 .../confirm-page-container.component.js       |   8 +-
 ui/pages/swaps/build-quote/build-quote.js     |  45 ++-
 .../swaps/build-quote/build-quote.test.js     |  20 ++
 ui/pages/swaps/swaps.util.ts                  |  12 -
 7 files changed, 491 insertions(+), 44 deletions(-)
 create mode 100644 shared/lib/token-util.ts

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index fe7782bc6..810eb2426 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -68,6 +68,7 @@ import {
   AssetType,
   TransactionStatus,
   TransactionType,
+  TokenStandard,
 } from '../../shared/constants/transaction';
 import {
   GAS_API_BASE_URL,
@@ -102,7 +103,10 @@ import {
 } from '../../shared/constants/app';
 import { EVENT, EVENT_NAMES } from '../../shared/constants/metametrics';
 
-import { getTokenIdParam } from '../../shared/lib/token-util';
+import {
+  getTokenIdParam,
+  fetchTokenBalance,
+} from '../../shared/lib/token-util.ts';
 import { isEqualCaseInsensitive } from '../../shared/modules/string-utils';
 import { parseStandardTokenTransactionData } from '../../shared/modules/transaction.utils';
 import { STATIC_MAINNET_TOKEN_LIST } from '../../shared/constants/tokens';
@@ -927,10 +931,7 @@ export default class MetamaskController extends EventEmitter {
         this.getExternalPendingTransactions.bind(this),
       getAccountType: this.getAccountType.bind(this),
       getDeviceModel: this.getDeviceModel.bind(this),
-      getTokenStandardAndDetails:
-        this.assetsContractController.getTokenStandardAndDetails.bind(
-          this.assetsContractController,
-        ),
+      getTokenStandardAndDetails: this.getTokenStandardAndDetails.bind(this),
       securityProviderRequest: this.securityProviderRequest.bind(this),
     });
     this.txController.on('newUnapprovedTx', () => opts.showUserConfirmation());
@@ -2161,12 +2162,72 @@ export default class MetamaskController extends EventEmitter {
   }
 
   async getTokenStandardAndDetails(address, userAddress, tokenId) {
-    const details =
-      await this.assetsContractController.getTokenStandardAndDetails(
+    const { tokenList } = this.tokenListController.state;
+    const { tokens } = this.tokensController.state;
+
+    const staticTokenListDetails =
+      STATIC_MAINNET_TOKEN_LIST[address.toLowerCase()] || {};
+    const tokenListDetails = tokenList[address.toLowerCase()] || {};
+    const userDefinedTokenDetails =
+      tokens.find(({ address: _address }) =>
+        isEqualCaseInsensitive(_address, address),
+      ) || {};
+
+    const tokenDetails = {
+      ...staticTokenListDetails,
+      ...tokenListDetails,
+      ...userDefinedTokenDetails,
+    };
+    const tokenDetailsStandardIsERC20 =
+      isEqualCaseInsensitive(tokenDetails.standard, TokenStandard.ERC20) ||
+      tokenDetails.erc20 === true;
+    const noEvidenceThatTokenIsAnNFT =
+      !tokenId &&
+      !isEqualCaseInsensitive(tokenDetails.standard, TokenStandard.ERC1155) &&
+      !isEqualCaseInsensitive(tokenDetails.standard, TokenStandard.ERC721) &&
+      !tokenDetails.erc721;
+
+    const otherDetailsAreERC20Like =
+      tokenDetails.decimals !== undefined && tokenDetails.symbol;
+
+    const tokenCanBeTreatedAsAnERC20 =
+      tokenDetailsStandardIsERC20 ||
+      (noEvidenceThatTokenIsAnNFT && otherDetailsAreERC20Like);
+
+    let details;
+    if (tokenCanBeTreatedAsAnERC20) {
+      try {
+        const balance = await fetchTokenBalance(
+          address,
+          userAddress,
+          this.provider,
+        );
+
+        details = {
+          address,
+          balance,
+          standard: TokenStandard.ERC20,
+          decimals: tokenDetails.decimals,
+          symbol: tokenDetails.symbol,
+        };
+      } catch (e) {
+        // If the `fetchTokenBalance` call failed, `details` remains undefined, and we
+        // fall back to the below `assetsContractController.getTokenStandardAndDetails` call
+        log.warning(`Failed to get token balance. Error: ${e}`);
+      }
+    }
+
+    // `details`` will be undefined if `tokenCanBeTreatedAsAnERC20`` is false,
+    // or if it is true but the `fetchTokenBalance`` call failed. In either case, we should
+    // attempt to retrieve details from `assetsContractController.getTokenStandardAndDetails`
+    if (details === undefined) {
+      details = await this.assetsContractController.getTokenStandardAndDetails(
         address,
         userAddress,
         tokenId,
       );
+    }
+
     return {
       ...details,
       decimals: details?.decimals?.toString(10),
diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js
index ab78c3100..f8ecf03e5 100644
--- a/app/scripts/metamask-controller.test.js
+++ b/app/scripts/metamask-controller.test.js
@@ -10,6 +10,7 @@ import { wordlist as englishWordlist } from '@metamask/scure-bip39/dist/wordlist
 import { TransactionStatus } from '../../shared/constants/transaction';
 import createTxMeta from '../../test/lib/createTxMeta';
 import { NETWORK_TYPES } from '../../shared/constants/network';
+import { createTestProviderTools } from '../../test/stub/provider';
 import {
   HardwareDeviceNames,
   HardwareKeyringTypes,
@@ -85,8 +86,28 @@ const createLoggerMiddlewareMock = () => (req, res, next) => {
   next();
 };
 
+const MOCK_TOKEN_BALANCE = '888';
+
+function MockEthContract() {
+  return () => {
+    return {
+      at: () => {
+        return {
+          balanceOf: () => MOCK_TOKEN_BALANCE,
+        };
+      },
+    };
+  };
+}
+
+// TODO, Feb 24, 2023:
+// ethjs-contract is being added to proxyquire, but we might want to discontinue proxyquire
+// this is for expediency as we resolve a bug for v10.26.0. The proper solution here would have
+// us set up the test infrastructure for a mocked provider. Github ticket for that is:
+// https://github.com/MetaMask/metamask-extension/issues/17890
 const MetaMaskController = proxyquire('./metamask-controller', {
   './lib/createLoggerMiddleware': { default: createLoggerMiddlewareMock },
+  'ethjs-contract': MockEthContract,
 }).default;
 
 const currentNetworkId = '5';
@@ -1273,4 +1294,321 @@ describe('MetaMaskController', function () {
       );
     });
   });
+
+  describe('getTokenStandardAndDetails', function () {
+    it('gets token data from the token list if available, and with a balance retrieved by fetchTokenBalance', async function () {
+      const providerResultStub = {
+        eth_getCode: '0x123',
+        eth_call:
+          '0x00000000000000000000000000000000000000000000000029a2241af62c0000',
+      };
+      const { provider } = createTestProviderTools({
+        scaffold: providerResultStub,
+        networkId: '5',
+        chainId: '5',
+      });
+
+      const tokenData = {
+        decimals: 18,
+        symbol: 'DAI',
+      };
+
+      metamaskController.tokenListController.update(() => {
+        return {
+          tokenList: {
+            '0x6b175474e89094c44da98b954eedeac495271d0f': tokenData,
+          },
+        };
+      });
+
+      metamaskController.provider = provider;
+      const tokenDetails = await metamaskController.getTokenStandardAndDetails(
+        '0x6B175474E89094C44Da98b954EedeAC495271d0F',
+        '0xf0d172594caedee459b89ad44c94098e474571b6',
+      );
+
+      assert.ok(
+        tokenDetails.standard === 'ERC20',
+        'tokenDetails should include token standard in upper case',
+      );
+      assert.ok(
+        tokenDetails.decimals === String(tokenData.decimals),
+        'tokenDetails should include token decimals as a string',
+      );
+      assert.ok(
+        tokenDetails.symbol === tokenData.symbol,
+        'tokenDetails should include token symbol',
+      );
+      assert.ok(
+        tokenDetails.balance === '3000000000000000000',
+        'tokenDetails should include a balance',
+      );
+    });
+
+    it('gets token data from tokens if available, and with a balance retrieved by fetchTokenBalance', async function () {
+      const providerResultStub = {
+        eth_getCode: '0x123',
+        eth_call:
+          '0x00000000000000000000000000000000000000000000000029a2241af62c0000',
+      };
+      const { provider } = createTestProviderTools({
+        scaffold: providerResultStub,
+        networkId: '5',
+        chainId: '5',
+      });
+
+      const tokenData = {
+        decimals: 18,
+        symbol: 'DAI',
+      };
+
+      metamaskController.tokensController.update({
+        tokens: [
+          {
+            address: '0x6b175474e89094c44da98b954eedeac495271d0f',
+            ...tokenData,
+          },
+        ],
+      });
+
+      metamaskController.provider = provider;
+      const tokenDetails = await metamaskController.getTokenStandardAndDetails(
+        '0x6B175474E89094C44Da98b954EedeAC495271d0F',
+        '0xf0d172594caedee459b89ad44c94098e474571b6',
+      );
+
+      assert.ok(
+        tokenDetails.standard === 'ERC20',
+        'tokenDetails should include token standard in upper case',
+      );
+      assert.ok(
+        tokenDetails.decimals === String(tokenData.decimals),
+        'tokenDetails should include token decimals as a string',
+      );
+      assert.ok(
+        tokenDetails.symbol === tokenData.symbol,
+        'tokenDetails should include token symbol',
+      );
+      assert.ok(
+        tokenDetails.balance === '3000000000000000000',
+        'tokenDetails should include a balance',
+      );
+    });
+
+    it('gets token data from contract-metadata if available, and with a balance retrieved by fetchTokenBalance', async function () {
+      const providerResultStub = {
+        eth_getCode: '0x123',
+        eth_call:
+          '0x00000000000000000000000000000000000000000000000029a2241af62c0000',
+      };
+      const { provider } = createTestProviderTools({
+        scaffold: providerResultStub,
+        networkId: '5',
+        chainId: '5',
+      });
+
+      metamaskController.provider = provider;
+      const tokenDetails = await metamaskController.getTokenStandardAndDetails(
+        '0x6B175474E89094C44Da98b954EedeAC495271d0F',
+        '0xf0d172594caedee459b89ad44c94098e474571b6',
+      );
+
+      assert.ok(
+        tokenDetails.standard === 'ERC20',
+        'tokenDetails should include token standard in upper case',
+      );
+      assert.ok(
+        tokenDetails.decimals === '18',
+        'tokenDetails should include token decimals as a string',
+      );
+      assert.ok(
+        tokenDetails.symbol === 'DAI',
+        'tokenDetails should include token symbol',
+      );
+      assert.ok(
+        tokenDetails.balance === '3000000000000000000',
+        'tokenDetails should include a balance',
+      );
+    });
+
+    it('gets token data from the blockchain, via the assetsContractController, if not available through other sources', async function () {
+      const providerResultStub = {
+        eth_getCode: '0x123',
+        eth_call:
+          '0x00000000000000000000000000000000000000000000000029a2241af62c0000',
+      };
+      const { provider } = createTestProviderTools({
+        scaffold: providerResultStub,
+        networkId: '5',
+        chainId: '5',
+      });
+
+      const tokenData = {
+        standard: 'ERC20',
+        decimals: 18,
+        symbol: 'DAI',
+        balance: '333',
+      };
+
+      metamaskController.tokenListController.update(() => {
+        return {
+          tokenList: {
+            '0x6b175474e89094c44da98b954eedeac495271d0f': {},
+          },
+        };
+      });
+
+      metamaskController.provider = provider;
+
+      sandbox
+        .stub(
+          metamaskController.assetsContractController,
+          'getTokenStandardAndDetails',
+        )
+        .callsFake(() => {
+          return tokenData;
+        });
+
+      const tokenDetails = await metamaskController.getTokenStandardAndDetails(
+        '0xNotInTokenList',
+        '0xf0d172594caedee459b89ad44c94098e474571b6',
+      );
+      assert.ok(
+        tokenDetails.standard === tokenData.standard.toUpperCase(),
+        'tokenDetails should include token standard in upper case',
+      );
+      assert.ok(
+        tokenDetails.decimals === String(tokenData.decimals),
+        'tokenDetails should include token decimals as a string',
+      );
+      assert.ok(
+        tokenDetails.symbol === tokenData.symbol,
+        'tokenDetails should include token symbol',
+      );
+      assert.ok(
+        tokenDetails.balance === tokenData.balance,
+        'tokenDetails should include a balance',
+      );
+    });
+
+    it('gets token data from the blockchain, via the assetsContractController, if it is in the token list but is an ERC721', async function () {
+      const providerResultStub = {
+        eth_getCode: '0x123',
+        eth_call:
+          '0x00000000000000000000000000000000000000000000000029a2241af62c0000',
+      };
+      const { provider } = createTestProviderTools({
+        scaffold: providerResultStub,
+        networkId: '5',
+        chainId: '5',
+      });
+
+      const tokenData = {
+        standard: 'ERC721',
+        decimals: 18,
+        symbol: 'DAI',
+        balance: '333',
+      };
+
+      metamaskController.tokenListController.update(() => {
+        return {
+          tokenList: {
+            '0xaaa75474e89094c44da98b954eedeac495271d0f': tokenData,
+          },
+        };
+      });
+
+      metamaskController.provider = provider;
+
+      sandbox
+        .stub(
+          metamaskController.assetsContractController,
+          'getTokenStandardAndDetails',
+        )
+        .callsFake(() => {
+          return tokenData;
+        });
+
+      const tokenDetails = await metamaskController.getTokenStandardAndDetails(
+        '0xAAA75474e89094c44da98b954eedeac495271d0f',
+        '0xf0d172594caedee459b89ad44c94098e474571b6',
+      );
+      assert.ok(
+        tokenDetails.standard === tokenData.standard.toUpperCase(),
+        'tokenDetails should include token standard in upper case',
+      );
+      assert.ok(
+        tokenDetails.decimals === String(tokenData.decimals),
+        'tokenDetails should include token decimals as a string',
+      );
+      assert.ok(
+        tokenDetails.symbol === tokenData.symbol,
+        'tokenDetails should include token symbol',
+      );
+      assert.ok(
+        tokenDetails.balance === tokenData.balance,
+        'tokenDetails should include a balance',
+      );
+    });
+
+    it('gets token data from the blockchain, via the assetsContractController, if it is in the token list but is an ERC1155', async function () {
+      const providerResultStub = {
+        eth_getCode: '0x123',
+        eth_call:
+          '0x00000000000000000000000000000000000000000000000029a2241af62c0000',
+      };
+      const { provider } = createTestProviderTools({
+        scaffold: providerResultStub,
+        networkId: '5',
+        chainId: '5',
+      });
+
+      const tokenData = {
+        standard: 'ERC1155',
+        decimals: 18,
+        symbol: 'DAI',
+        balance: '333',
+      };
+
+      metamaskController.tokenListController.update(() => {
+        return {
+          tokenList: {
+            '0xaaa75474e89094c44da98b954eedeac495271d0f': tokenData,
+          },
+        };
+      });
+
+      metamaskController.provider = provider;
+
+      sandbox
+        .stub(
+          metamaskController.assetsContractController,
+          'getTokenStandardAndDetails',
+        )
+        .callsFake(() => {
+          return tokenData;
+        });
+
+      const tokenDetails = await metamaskController.getTokenStandardAndDetails(
+        '0xAAA75474e89094c44da98b954eedeac495271d0f',
+        '0xf0d172594caedee459b89ad44c94098e474571b6',
+      );
+      assert.ok(
+        tokenDetails.standard === tokenData.standard.toUpperCase(),
+        'tokenDetails should include token standard in upper case',
+      );
+      assert.ok(
+        tokenDetails.decimals === String(tokenData.decimals),
+        'tokenDetails should include token decimals as a string',
+      );
+      assert.ok(
+        tokenDetails.symbol === tokenData.symbol,
+        'tokenDetails should include token symbol',
+      );
+      assert.ok(
+        tokenDetails.balance === tokenData.balance,
+        'tokenDetails should include a balance',
+      );
+    });
+  });
 });
diff --git a/shared/lib/token-util.ts b/shared/lib/token-util.ts
new file mode 100644
index 000000000..517359849
--- /dev/null
+++ b/shared/lib/token-util.ts
@@ -0,0 +1,37 @@
+import { abiERC20 } from '@metamask/metamask-eth-abis';
+import { Contract } from '@ethersproject/contracts';
+import { Web3Provider } from '@ethersproject/providers';
+
+/**
+ * Gets the '_value' parameter of the given token transaction data
+ * (i.e function call) per the Human Standard Token ABI, if present.
+ *
+ * @param {object} tokenData - ethers Interface token data.
+ * @returns {string | undefined} A decimal string value.
+ */
+/**
+ * Gets either the '_tokenId' parameter or the 'id' param of the passed token transaction data.,
+ * These are the parsed tokenId values returned by `parseStandardTokenTransactionData` as defined
+ * in the ERC721 and ERC1155 ABIs from metamask-eth-abis (https://github.com/MetaMask/metamask-eth-abis/tree/main/src/abis)
+ *
+ * @param tokenData - ethers Interface token data.
+ * @returns A decimal string value.
+ */
+export function getTokenIdParam(tokenData: any = {}): string | undefined {
+  return (
+    tokenData?.args?._tokenId?.toString() ?? tokenData?.args?.id?.toString()
+  );
+}
+
+export async function fetchTokenBalance(
+  address: string,
+  userAddress: string,
+  provider: any,
+): Promise<any> {
+  const ethersProvider = new Web3Provider(provider);
+  const tokenContract = new Contract(address, abiERC20, ethersProvider);
+  const tokenBalancePromise = tokenContract
+    ? tokenContract.balanceOf(userAddress)
+    : Promise.resolve();
+  return await tokenBalancePromise;
+}
diff --git a/ui/components/app/confirm-page-container/confirm-page-container.component.js b/ui/components/app/confirm-page-container/confirm-page-container.component.js
index 2a8065850..d4db4a445 100644
--- a/ui/components/app/confirm-page-container/confirm-page-container.component.js
+++ b/ui/components/app/confirm-page-container/confirm-page-container.component.js
@@ -25,7 +25,7 @@ import { TypographyVariant } from '../../../helpers/constants/design-system';
 
 import NetworkAccountBalanceHeader from '../network-account-balance-header/network-account-balance-header';
 import DepositPopover from '../deposit-popover/deposit-popover';
-import { fetchTokenBalance } from '../../../pages/swaps/swaps.util';
+import { fetchTokenBalance } from '../../../../shared/lib/token-util.ts';
 import SetApproveForAllWarning from '../set-approval-for-all-warning';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
@@ -126,7 +126,11 @@ const ConfirmPageContainer = (props) => {
     NETWORK_TO_NAME_MAP[currentTransaction.chainId] || networkIdentifier;
 
   const fetchCollectionBalance = useCallback(async () => {
-    const tokenBalance = await fetchTokenBalance(tokenAddress, fromAddress);
+    const tokenBalance = await fetchTokenBalance(
+      tokenAddress,
+      fromAddress,
+      global.ethereumProvider,
+    );
     setCollectionBalance(tokenBalance?.balance?.words?.[0] || 0);
   }, [fromAddress, tokenAddress]);
 
diff --git a/ui/pages/swaps/build-quote/build-quote.js b/ui/pages/swaps/build-quote/build-quote.js
index e4e22d794..f68683e09 100644
--- a/ui/pages/swaps/build-quote/build-quote.js
+++ b/ui/pages/swaps/build-quote/build-quote.js
@@ -98,14 +98,11 @@ import {
   setSmartTransactionsOptInStatus,
   clearSmartTransactionFees,
 } from '../../../store/actions';
-import {
-  countDecimals,
-  fetchTokenPrice,
-  fetchTokenBalance,
-} from '../swaps.util';
+import { countDecimals, fetchTokenPrice } from '../swaps.util';
 import SwapsFooter from '../swaps-footer';
 import { isEqualCaseInsensitive } from '../../../../shared/modules/string-utils';
 import { calcTokenAmount } from '../../../../shared/lib/transactions-controller-utils';
+import { fetchTokenBalance } from '../../../../shared/lib/token-util.ts';
 import { shouldEnableDirectWrapping } from '../../../../shared/lib/swaps-utils';
 import {
   getValueFromWeiHex,
@@ -313,24 +310,26 @@ export default function BuildQuote({
         isEqualCaseInsensitive(usersToken.address, token.address),
       )
     ) {
-      fetchTokenBalance(token.address, selectedAccountAddress).then(
-        (fetchedBalance) => {
-          if (fetchedBalance?.balance) {
-            const balanceAsDecString = fetchedBalance.balance.toString(10);
-            const userTokenBalance = calcTokenAmount(
-              balanceAsDecString,
-              token.decimals,
-            );
-            dispatch(
-              setSwapsFromToken({
-                ...token,
-                string: userTokenBalance.toString(10),
-                balance: balanceAsDecString,
-              }),
-            );
-          }
-        },
-      );
+      fetchTokenBalance(
+        token.address,
+        selectedAccountAddress,
+        global.ethereumProvider,
+      ).then((fetchedBalance) => {
+        if (fetchedBalance?.balance) {
+          const balanceAsDecString = fetchedBalance.balance.toString(10);
+          const userTokenBalance = calcTokenAmount(
+            balanceAsDecString,
+            token.decimals,
+          );
+          dispatch(
+            setSwapsFromToken({
+              ...token,
+              string: userTokenBalance.toString(10),
+              balance: balanceAsDecString,
+            }),
+          );
+        }
+      });
     }
     dispatch(setSwapsFromToken(token));
     onInputChange(
diff --git a/ui/pages/swaps/build-quote/build-quote.test.js b/ui/pages/swaps/build-quote/build-quote.test.js
index 8178566c9..ea8c2cc70 100644
--- a/ui/pages/swaps/build-quote/build-quote.test.js
+++ b/ui/pages/swaps/build-quote/build-quote.test.js
@@ -8,6 +8,7 @@ import {
   setBackgroundConnection,
   fireEvent,
 } from '../../../../test/jest';
+import { createTestProviderTools } from '../../../../test/stub/provider';
 import {
   setSwapsFromToken,
   setSwapToToken,
@@ -61,8 +62,27 @@ jest.mock('../swaps.util', () => {
   };
 });
 
+const providerResultStub = {
+  eth_getCode: '0x123',
+  eth_call:
+    '0x00000000000000000000000000000000000000000000000029a2241af62c0000',
+};
+const { provider } = createTestProviderTools({
+  scaffold: providerResultStub,
+  networkId: '5',
+  chainId: '5',
+});
+
 describe('BuildQuote', () => {
+  beforeAll(() => {
+    jest.clearAllMocks();
+  });
+
   beforeEach(() => {
+    global.ethereumProvider = provider;
+  });
+
+  afterEach(() => {
     jest.clearAllMocks();
   });
 
diff --git a/ui/pages/swaps/swaps.util.ts b/ui/pages/swaps/swaps.util.ts
index aff0d9c5d..08aae34a9 100644
--- a/ui/pages/swaps/swaps.util.ts
+++ b/ui/pages/swaps/swaps.util.ts
@@ -1,5 +1,4 @@
 import { BigNumber } from 'bignumber.js';
-import abi from 'human-standard-token-abi';
 import { Json } from '@metamask/controller-utils';
 import { IndividualTxFees } from '@metamask/smart-transactions-controller/dist/types';
 import {
@@ -215,17 +214,6 @@ export async function fetchTokenPrice(address: string): Promise<any> {
   return prices?.[address]?.eth;
 }
 
-export async function fetchTokenBalance(
-  address: string,
-  userAddress: string,
-): Promise<any> {
-  const tokenContract = (global as any).eth.contract(abi).at(address);
-  const tokenBalancePromise = tokenContract
-    ? tokenContract.balanceOf(userAddress)
-    : Promise.resolve();
-  return await tokenBalancePromise;
-}
-
 export async function fetchSwapsGasPrices(chainId: any): Promise<
   | any
   | {

From 535d55ea8b8f73c6a475fc84841a55c24d87a04c Mon Sep 17 00:00:00 2001
From: PeterYinusa <peter.yinusa@consensys.net>
Date: Thu, 9 Mar 2023 10:37:54 +0000
Subject: [PATCH 30/36] bump test coverage

---
 coverage-targets.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/coverage-targets.js b/coverage-targets.js
index d5bce3b6f..4d19f29d7 100644
--- a/coverage-targets.js
+++ b/coverage-targets.js
@@ -6,10 +6,10 @@
 // subset of files to check against these targets.
 module.exports = {
   global: {
-    lines: 63,
-    branches: 51,
-    statements: 62,
-    functions: 55,
+    lines: 63.5,
+    branches: 52,
+    statements: 63,
+    functions: 56,
   },
   transforms: {
     branches: 100,

From 150f0ee766385ee72462af2e43414549754221c6 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Fri, 10 Mar 2023 05:36:07 -0800
Subject: [PATCH 31/36] Use replace instead of replace all so that we are
 compatible with v78 (#18080)

* Use replace instead of replace all so that we are compatible with v78

* Add unit tests
---
 ui/helpers/utils/util.js      |  2 +-
 ui/helpers/utils/util.test.js | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/ui/helpers/utils/util.js b/ui/helpers/utils/util.js
index eeef079bf..f6804c1f1 100644
--- a/ui/helpers/utils/util.js
+++ b/ui/helpers/utils/util.js
@@ -560,5 +560,5 @@ export const sanitizeString = (value) => {
     return value;
   }
   const regex = /\u202E/giu;
-  return value.replaceAll(regex, '\\u202E');
+  return value.replace(regex, '\\u202E');
 };
diff --git a/ui/helpers/utils/util.test.js b/ui/helpers/utils/util.test.js
index 228d58404..e4d152658 100644
--- a/ui/helpers/utils/util.test.js
+++ b/ui/helpers/utils/util.test.js
@@ -565,4 +565,28 @@ describe('util', () => {
       expect(result.do_not_display_2).toBeUndefined();
     });
   });
+
+  describe('sanitizeString', () => {
+    it('should return the passed value, unchanged, if it is falsy', () => {
+      expect(util.sanitizeString('')).toStrictEqual('');
+    });
+
+    it('should return the passed value, unchanged, if it is not a string', () => {
+      expect(util.sanitizeString(true)).toStrictEqual(true);
+    });
+
+    it('should return a truthy string that oes not match the sanitizeString regex, unchanged', () => {
+      expect(
+        util.sanitizeString('The Quick Brown Fox Jumps Over The Lazy Dog'),
+      ).toStrictEqual('The Quick Brown Fox Jumps Over The Lazy Dog');
+    });
+
+    it('should return a string that matches sanitizeString regex with the matched characters replaced', () => {
+      expect(
+        util.sanitizeString(
+          'The Quick Brown \u202EFox Jumps Over The Lazy Dog',
+        ),
+      ).toStrictEqual('The Quick Brown \\u202EFox Jumps Over The Lazy Dog');
+    });
+  });
 });

From cfced8f1248dde34794de49352ae6db075444d1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Tavares?= <joao.tavares@consensys.net>
Date: Mon, 13 Mar 2023 11:42:01 +0000
Subject: [PATCH 32/36] fix: do not run desktop prep build step on master
 (#18112)

---
 .circleci/config.yml | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5e3a1487b..637b64611 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -52,6 +52,9 @@ workflows:
           requires:
             - prep-deps
       - prep-build-desktop:
+          filters:
+            branches:
+              ignore: master
           requires:
             - prep-deps
       - prep-build-flask:
@@ -134,6 +137,9 @@ workflows:
           requires:
             - prep-build-beta
       - validate-source-maps-desktop:
+          filters:
+            branches:
+              ignore: master
           requires:
             - prep-build-desktop
       - validate-source-maps-flask:
@@ -148,6 +154,9 @@ workflows:
             - prep-deps
             - prep-build-beta
       - test-mozilla-lint-desktop:
+          filters:
+            branches:
+              ignore: master
           requires:
             - prep-deps
             - prep-build-desktop
@@ -392,25 +401,9 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
-      - when:
-          condition:
-            not:
-              matches:
-                pattern: /^master$/
-                value: << pipeline.git.branch >>
-          steps:
-            - run:
-                name: build:dist
-                command: yarn build --build-type desktop dist
-      - when:
-          condition:
-            matches:
-              pattern: /^master$/
-              value: << pipeline.git.branch >>
-          steps:
-            - run:
-                name: build:prod
-                command: yarn build --build-type desktop prod
+      - run:
+          name: build:dist
+          command: yarn build --build-type desktop dist
       - run:
           name: build:debug
           command: find dist/ -type f -exec md5sum {} \; | sort -k 2

From fd480ad773c62dc3d54eb4ee4d07ba24f903c1ab Mon Sep 17 00:00:00 2001
From: MetaMask Bot <metamaskbot@users.noreply.github.com>
Date: Mon, 13 Mar 2023 11:49:38 +0000
Subject: [PATCH 33/36] Version v10.26.1

---
 CHANGELOG.md | 162 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 package.json |   2 +-
 2 files changed, 162 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 005691832..acd7bb42e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,165 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [10.26.1]
+### Uncategorized
+- fix: do not run desktop prep build step on master ([#18112](https://github.com/MetaMask/metamask-extension/pull/18112))
+- Version v10.26.0 RC ([#17698](https://github.com/MetaMask/metamask-extension/pull/17698))
+- Use replace instead of replace all so that we are compatible with v78 ([#18080](https://github.com/MetaMask/metamask-extension/pull/18080))
+- bump test coverage
+- Use tokenList to get token details, when available, in getTokenStanda… ([#17891](https://github.com/MetaMask/metamask-extension/pull/17891))
+- fix(17542): fix fiat currency display in few txn actions ([#18011](https://github.com/MetaMask/metamask-extension/pull/18011))
+- patch lavamoat files to make v10.26.0 compatible with v78 of chrome ([#18053](https://github.com/MetaMask/metamask-extension/pull/18053))
+- Update CHANGELOG.md
+- [FLASK] Temporarily disable JSON-RPC snap e2e test ([#17778](https://github.com/MetaMask/metamask-extension/pull/17778))
+- Policy updates
+- bump test coverage
+- Update the PhishingController to v2 tests
+- fix(17857): show correctly converted account balance in sign&encrypt windows ([#17973](https://github.com/MetaMask/metamask-extension/pull/17973))
+- Selector performance improvements ([#17410](https://github.com/MetaMask/metamask-extension/pull/17410))
+- Fix incorrect balance in signature request header ([#17829](https://github.com/MetaMask/metamask-extension/pull/17829))
+- e2e Send to Multisig Wallet ([#17565](https://github.com/MetaMask/metamask-extension/pull/17565))
+- Fix state in confirm transaction ([#17838](https://github.com/MetaMask/metamask-extension/pull/17838))
+- Cleanup: clearTimeout on useEffect for gas estimation and prevent state update on unmounted ConfirmTransactionBase ([#17804](https://github.com/MetaMask/metamask-extension/pull/17804))
+- Confirm transaction test ([#17780](https://github.com/MetaMask/metamask-extension/pull/17780))
+- Clean ConfirmTranscationPage component ([#17546](https://github.com/MetaMask/metamask-extension/pull/17546))
+- Fix GetEncryptionKey TypeError Cannot destructure property 'msgParams' of 'txData' ([#17808](https://github.com/MetaMask/metamask-extension/pull/17808))
+- avoid mutation of state in signTransaction action ([#17772](https://github.com/MetaMask/metamask-extension/pull/17772))
+- adds test and fix for conversion to use numeric ([#17758](https://github.com/MetaMask/metamask-extension/pull/17758))
+- Version v10.26.0
+- Sync `master` with `develop` ([#17665](https://github.com/MetaMask/metamask-extension/pull/17665))
+- Deprecating Typography component ([#17672](https://github.com/MetaMask/metamask-extension/pull/17672))
+- Add testing documentation ([#17411](https://github.com/MetaMask/metamask-extension/pull/17411))
+- Merge branch 'develop' into master-sync
+- Merge branch 'develop' into master-sync
+- fix test of useTransactionDisplayData for different timezone ([#17063](https://github.com/MetaMask/metamask-extension/pull/17063))
+- Conflict cleanup 10.25.0 master-sync
+- Merge remote-tracking branch 'origin/develop' into master-sync
+- Expand network controller unit test coverage ([#17498](https://github.com/MetaMask/metamask-extension/pull/17498))
+- Detect and track UI customizations on Personal Sign Requests ([#16222](https://github.com/MetaMask/metamask-extension/pull/16222))
+- Sign-in with Ethereum Domain Binding ([#16616](https://github.com/MetaMask/metamask-extension/pull/16616))
+- Update `json-rpc-middleware-stream` from v2 to v4 ([#17588](https://github.com/MetaMask/metamask-extension/pull/17588))
+- converted collectibles files to nfts ([#17658](https://github.com/MetaMask/metamask-extension/pull/17658))
+- E2e test insights ([#17535](https://github.com/MetaMask/metamask-extension/pull/17535))
+- [TS dashboard] Reorganize files slightly ([#17335](https://github.com/MetaMask/metamask-extension/pull/17335))
+- add brad-decker as codeowner of .circle/ folder ([#17648](https://github.com/MetaMask/metamask-extension/pull/17648))
+- Refactor ConfirmTransaction to Functional Component ([#17473](https://github.com/MetaMask/metamask-extension/pull/17473))
+- Add desktop build type ([#17592](https://github.com/MetaMask/metamask-extension/pull/17592))
+- add double arrow icons ([#17654](https://github.com/MetaMask/metamask-extension/pull/17654))
+- Add e2e test: send nft  ([#17638](https://github.com/MetaMask/metamask-extension/pull/17638))
+- Adding docs for layout and spacing for Icon component ([#17612](https://github.com/MetaMask/metamask-extension/pull/17612))
+- Collectible Unit Tests ([#17632](https://github.com/MetaMask/metamask-extension/pull/17632))
+- Update BannerAlert component ([#17586](https://github.com/MetaMask/metamask-extension/pull/17586))
+- [FLASK] Create E2E test for RPC endowment ([#17525](https://github.com/MetaMask/metamask-extension/pull/17525))
+- Added metric Phishing Page Displayed for phishing warning page ([#17462](https://github.com/MetaMask/metamask-extension/pull/17462))
+- updated assets and phishing controller packages ([#17569](https://github.com/MetaMask/metamask-extension/pull/17569))
+- Prevent lint warning in ActionableMessage ([#17598](https://github.com/MetaMask/metamask-extension/pull/17598))
+- [doc] add Jest debugging guide (docs/tests/jest.md) ([#17594](https://github.com/MetaMask/metamask-extension/pull/17594))
+- NFTs: Update event name for Detect NFT settings ([#17597](https://github.com/MetaMask/metamask-extension/pull/17597))
+- Change COLORS reference to Color ([#17599](https://github.com/MetaMask/metamask-extension/pull/17599))
+- UX: Remove the IconCopy and IconCopied Components and their usages ([#17530](https://github.com/MetaMask/metamask-extension/pull/17530))
+- Convert actions.js to typescript ([#17446](https://github.com/MetaMask/metamask-extension/pull/17446))
+- Disable fiat conversion in Approve Screen when `Show balance and token price checker` is OFF ([#17443](https://github.com/MetaMask/metamask-extension/pull/17443))
+- Ensure the advanced gas modal displays a zero priority fee if that is how it is set in the transaction ([#17559](https://github.com/MetaMask/metamask-extension/pull/17559))
+- feature: convert ui/ducks/app/app.ts to typescript ([#17454](https://github.com/MetaMask/metamask-extension/pull/17454))
+- Fix speed up of 0 max priority fee transactions ([#17547](https://github.com/MetaMask/metamask-extension/pull/17547))
+- update banner base component ([#17582](https://github.com/MetaMask/metamask-extension/pull/17582))
+- decrease coverage threshold that requires bump ([#17544](https://github.com/MetaMask/metamask-extension/pull/17544))
+- Dead and redundant code removal ([#17512](https://github.com/MetaMask/metamask-extension/pull/17512))
+- initialize currentLocale in the locale slice upon app start ([#17579](https://github.com/MetaMask/metamask-extension/pull/17579))
+- fix: fix non-critical warning in tests ([#17567](https://github.com/MetaMask/metamask-extension/pull/17567))
+- feature: migrate design-system.ts ([#17518](https://github.com/MetaMask/metamask-extension/pull/17518))
+- Convert store.js to typescript and redux toolkit ([#17508](https://github.com/MetaMask/metamask-extension/pull/17508))
+- Add error module for safely handling errors ([#17511](https://github.com/MetaMask/metamask-extension/pull/17511))
+- Convert action-queue to TypeScript ([#17509](https://github.com/MetaMask/metamask-extension/pull/17509))
+- Add network client tests for methods not supported by Infura ([#17347](https://github.com/MetaMask/metamask-extension/pull/17347))
+- Add e2e test:  import nft ([#17543](https://github.com/MetaMask/metamask-extension/pull/17543))
+- Convert confirm-tx.utils.js to typescript ([#17349](https://github.com/MetaMask/metamask-extension/pull/17349))
+- updated CollectibleDetail Storybook Coverage ([#17351](https://github.com/MetaMask/metamask-extension/pull/17351))
+- adding textfix on experimental tab ([#17306](https://github.com/MetaMask/metamask-extension/pull/17306))
+- Allow background to handle forgotten password flow ([#17501](https://github.com/MetaMask/metamask-extension/pull/17501))
+- GasDisplay: fix z-index for Confirm Approve warning ([#17470](https://github.com/MetaMask/metamask-extension/pull/17470))
+- Detailed document for refactoring signature request pages in extension ([#17456](https://github.com/MetaMask/metamask-extension/pull/17456))
+- Move confirm-transaction/conf-tx.js to confirm-signature-request ([#17408](https://github.com/MetaMask/metamask-extension/pull/17408))
+- remove nft toaster on first autohide ([#17536](https://github.com/MetaMask/metamask-extension/pull/17536))
+- Convert ui/store/actionConstants.js -> Typescript ([#17442](https://github.com/MetaMask/metamask-extension/pull/17442))
+- Fixing yarn version command, adding yarn version plugin ([#17325](https://github.com/MetaMask/metamask-extension/pull/17325))
+- 🐛 Calldata validation ([#17326](https://github.com/MetaMask/metamask-extension/pull/17326))
+- remove unused banner base proptype ([#17531](https://github.com/MetaMask/metamask-extension/pull/17531))
+- Add tests for `retryOnEmpty` middleware ([#17364](https://github.com/MetaMask/metamask-extension/pull/17364))
+- prefer locale slice for locale state ([#17499](https://github.com/MetaMask/metamask-extension/pull/17499))
+- Fixing/extending type definitions for later usage ([#17514](https://github.com/MetaMask/metamask-extension/pull/17514))
+- TypeScript tooling fixes ([#17513](https://github.com/MetaMask/metamask-extension/pull/17513))
+- Onboarding V2: Remove old onboarding flow ([#17081](https://github.com/MetaMask/metamask-extension/pull/17081))
+- Fix build ([#17538](https://github.com/MetaMask/metamask-extension/pull/17538))
+- fix button text props ([#17478](https://github.com/MetaMask/metamask-extension/pull/17478))
+- Refactoring confirm-transaction-base component ([#17484](https://github.com/MetaMask/metamask-extension/pull/17484))
+- Refactor conf-tx.js ([#17380](https://github.com/MetaMask/metamask-extension/pull/17380))
+- Move THEME_TYPE to new preferences.ts file ([#17515](https://github.com/MetaMask/metamask-extension/pull/17515))
+- Fix #17328 - Move NFT settings to Experimental ([#17400](https://github.com/MetaMask/metamask-extension/pull/17400))
+- UX - Update all copy icons ([#17445](https://github.com/MetaMask/metamask-extension/pull/17445))
+- Fix #17393 - Fix NFT collection header image ([#17394](https://github.com/MetaMask/metamask-extension/pull/17394))
+- Add e2e test: add custome network during onboarding ([#17436](https://github.com/MetaMask/metamask-extension/pull/17436))
+- feat(mme-17214): migrate L33 files to typescript ([#17372](https://github.com/MetaMask/metamask-extension/pull/17372))
+- master sync following v10.24.2 ([#17504](https://github.com/MetaMask/metamask-extension/pull/17504))
+- Merge remote-tracking branch 'origin/develop' into master-sync
+- Document `displayWarning` as deprecated ([#17465](https://github.com/MetaMask/metamask-extension/pull/17465))
+- Ignore `storybook-build` lint errors ([#17373](https://github.com/MetaMask/metamask-extension/pull/17373))
+- Nft build for e2e tests ([#17430](https://github.com/MetaMask/metamask-extension/pull/17430))
+- feature: convert level 32 files to typescript ([#17390](https://github.com/MetaMask/metamask-extension/pull/17390))
+- [e2e]Add e2e test for deleting custom network ([#17254](https://github.com/MetaMask/metamask-extension/pull/17254))
+- Fix #17362 - Ensure NFT icons are correct ([#17440](https://github.com/MetaMask/metamask-extension/pull/17440))
+- Fix #17385 - Provide autohide callback for ActionMessage ([#17392](https://github.com/MetaMask/metamask-extension/pull/17392))
+- button link housekeeping ([#16885](https://github.com/MetaMask/metamask-extension/pull/16885))
+- Bump lavapack version to 5 ([#17431](https://github.com/MetaMask/metamask-extension/pull/17431))
+- feature: convert shared/modules/contract-utils.test.js to typescript ([#17435](https://github.com/MetaMask/metamask-extension/pull/17435))
+- Refactor confirm page container component from class to functional component ([#16907](https://github.com/MetaMask/metamask-extension/pull/16907))
+- Test parameter change cache miss ([#17346](https://github.com/MetaMask/metamask-extension/pull/17346))
+- Document callback-style background calls as deprecated ([#17376](https://github.com/MetaMask/metamask-extension/pull/17376))
+- Put hardware wallets behind an HARDWARE_WALLETS_MV3 flag ([#17354](https://github.com/MetaMask/metamask-extension/pull/17354))
+- Consolidated all component import paths ([#17368](https://github.com/MetaMask/metamask-extension/pull/17368))
+- updated new links for the stories ([#17369](https://github.com/MetaMask/metamask-extension/pull/17369))
+- Fix #17388 - Remove dismiss button from NFT notification ([#17389](https://github.com/MetaMask/metamask-extension/pull/17389))
+- Feat/15086/add banner severities component ([#17307](https://github.com/MetaMask/metamask-extension/pull/17307))
+- fix icon names ([#17391](https://github.com/MetaMask/metamask-extension/pull/17391))
+- Fix Playwright install step ([#17415](https://github.com/MetaMask/metamask-extension/pull/17415))
+- Fix broken NFT import and auto-detect flows ([#17384](https://github.com/MetaMask/metamask-extension/pull/17384))
+- Convert ui/helpers/constants/common to typescript ([#17348](https://github.com/MetaMask/metamask-extension/pull/17348))
+- Add alt text for NFT images ([#17284](https://github.com/MetaMask/metamask-extension/pull/17284))
+- Nit fixes for story-test integration ([#17344](https://github.com/MetaMask/metamask-extension/pull/17344))
+- remove duplicate comment line ([#17381](https://github.com/MetaMask/metamask-extension/pull/17381))
+- Complete level 36 migration of TypeScript by converting conversion.utils.js and deprecate old conversion util ([#17262](https://github.com/MetaMask/metamask-extension/pull/17262))
+- icon audit, remove xxs icon size ([#17089](https://github.com/MetaMask/metamask-extension/pull/17089))
+- Activate LavaMoat scuttling security feature ([#17276](https://github.com/MetaMask/metamask-extension/pull/17276))
+- feat(mme-17212): convert shared/constants/swaps.js -> Typescript ([#17322](https://github.com/MetaMask/metamask-extension/pull/17322))
+- Add Firefox Snow support ([#17147](https://github.com/MetaMask/metamask-extension/pull/17147))
+- Move subject type enum to `@metamask/subject-metadata-controller` ([#16431](https://github.com/MetaMask/metamask-extension/pull/16431))
+- Replace usages of conversion util in rest of UI folder in favor of Numeric ([#17334](https://github.com/MetaMask/metamask-extension/pull/17334))
+- Fix/use etherjs specific imports ([#15461](https://github.com/MetaMask/metamask-extension/pull/15461))
+- Fix #17300, #16843 - Use proper source for image of IPFS NFTs ([#17302](https://github.com/MetaMask/metamask-extension/pull/17302))
+- Sync `master` with `develop` ([#17359](https://github.com/MetaMask/metamask-extension/pull/17359))
+- [FLASK] `snaps-monorepo@0.28.0` ([#17277](https://github.com/MetaMask/metamask-extension/pull/17277))
+- Remove usages of Conversion util in components folder in favor of Numeric ([#17333](https://github.com/MetaMask/metamask-extension/pull/17333))
+- Refactor Errors E2E test to no longer rely upon a real error ([#17332](https://github.com/MetaMask/metamask-extension/pull/17332))
+- Merge remote-tracking branch 'origin/develop' into master-sync
+- Fix cookiejar dependency vulnerability ([#17355](https://github.com/MetaMask/metamask-extension/pull/17355))
+- Refactor usages of conversion util in the app folder and shared folder in favor of Numeric ([#17331](https://github.com/MetaMask/metamask-extension/pull/17331))
+- Updated Icons in Title of NFTs ([#17205](https://github.com/MetaMask/metamask-extension/pull/17205))
+- Convert app//scripts/lib/util.js to typescript ([#17330](https://github.com/MetaMask/metamask-extension/pull/17330))
+- Security provider check (OpenSea) ([#16584](https://github.com/MetaMask/metamask-extension/pull/16584))
+- Setup network controller mocks per-test ([#17250](https://github.com/MetaMask/metamask-extension/pull/17250))
+- Added toaster for removed NFTs ([#17297](https://github.com/MetaMask/metamask-extension/pull/17297))
+- Integrate `KeyringController` v10 ([#17056](https://github.com/MetaMask/metamask-extension/pull/17056))
+- add numeric module ([#17324](https://github.com/MetaMask/metamask-extension/pull/17324))
+- Convert app/scripts/constants -> Typescript ([#17327](https://github.com/MetaMask/metamask-extension/pull/17327))
+- Use async/await instead of Promise.resolve ([#16221](https://github.com/MetaMask/metamask-extension/pull/16221))
+- Added storybook check to CI ([#17092](https://github.com/MetaMask/metamask-extension/pull/17092))
+- feat(mme-17212): convert shared/module/string-utils.js -> Typescript ([#17320](https://github.com/MetaMask/metamask-extension/pull/17320))
+- Relocate conversion utils to shared/modules/conversion.utils.js ([#17319](https://github.com/MetaMask/metamask-extension/pull/17319))
+- fix script for linting changed files ([#17028](https://github.com/MetaMask/metamask-extension/pull/17028))
+- Convert shared/constants/hardware-wallets.js -> Typescript ([#17310](https://github.com/MetaMask/metamask-extension/pull/17310))
+- Convert shared/constants/labels.js -> Typescript ([#17309](https://github.com/MetaMask/metamask-extension/pull/17309))
+
 ## [10.26.0]
 ### Added
 - Adding browser outdated notification ([#17027](https://github.com/MetaMask/metamask-extension/pull/17027))
@@ -3528,7 +3687,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/v10.26.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.26.1...HEAD
+[10.26.1]: https://github.com/MetaMask/metamask-extension/compare/v10.26.0...v10.26.1
 [10.26.0]: https://github.com/MetaMask/metamask-extension/compare/v10.25.0...v10.26.0
 [10.25.0]: https://github.com/MetaMask/metamask-extension/compare/v10.24.2...v10.25.0
 [10.24.2]: https://github.com/MetaMask/metamask-extension/compare/v10.24.1...v10.24.2
diff --git a/package.json b/package.json
index 5897ea23d..c0e532056 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "10.26.0",
+  "version": "10.26.1",
   "private": true,
   "repository": {
     "type": "git",

From 6bc51792903ede56834ea173d4b82f089007531c Mon Sep 17 00:00:00 2001
From: Dan Miller <danjm.com@gmail.com>
Date: Mon, 13 Mar 2023 09:33:27 -0230
Subject: [PATCH 34/36] Update changelog

---
 CHANGELOG.md | 159 +--------------------------------------------------
 1 file changed, 2 insertions(+), 157 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index acd7bb42e..2f30379c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,163 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [10.26.1]
-### Uncategorized
-- fix: do not run desktop prep build step on master ([#18112](https://github.com/MetaMask/metamask-extension/pull/18112))
-- Version v10.26.0 RC ([#17698](https://github.com/MetaMask/metamask-extension/pull/17698))
-- Use replace instead of replace all so that we are compatible with v78 ([#18080](https://github.com/MetaMask/metamask-extension/pull/18080))
-- bump test coverage
-- Use tokenList to get token details, when available, in getTokenStanda… ([#17891](https://github.com/MetaMask/metamask-extension/pull/17891))
-- fix(17542): fix fiat currency display in few txn actions ([#18011](https://github.com/MetaMask/metamask-extension/pull/18011))
-- patch lavamoat files to make v10.26.0 compatible with v78 of chrome ([#18053](https://github.com/MetaMask/metamask-extension/pull/18053))
-- Update CHANGELOG.md
-- [FLASK] Temporarily disable JSON-RPC snap e2e test ([#17778](https://github.com/MetaMask/metamask-extension/pull/17778))
-- Policy updates
-- bump test coverage
-- Update the PhishingController to v2 tests
-- fix(17857): show correctly converted account balance in sign&encrypt windows ([#17973](https://github.com/MetaMask/metamask-extension/pull/17973))
-- Selector performance improvements ([#17410](https://github.com/MetaMask/metamask-extension/pull/17410))
-- Fix incorrect balance in signature request header ([#17829](https://github.com/MetaMask/metamask-extension/pull/17829))
-- e2e Send to Multisig Wallet ([#17565](https://github.com/MetaMask/metamask-extension/pull/17565))
-- Fix state in confirm transaction ([#17838](https://github.com/MetaMask/metamask-extension/pull/17838))
-- Cleanup: clearTimeout on useEffect for gas estimation and prevent state update on unmounted ConfirmTransactionBase ([#17804](https://github.com/MetaMask/metamask-extension/pull/17804))
-- Confirm transaction test ([#17780](https://github.com/MetaMask/metamask-extension/pull/17780))
-- Clean ConfirmTranscationPage component ([#17546](https://github.com/MetaMask/metamask-extension/pull/17546))
-- Fix GetEncryptionKey TypeError Cannot destructure property 'msgParams' of 'txData' ([#17808](https://github.com/MetaMask/metamask-extension/pull/17808))
-- avoid mutation of state in signTransaction action ([#17772](https://github.com/MetaMask/metamask-extension/pull/17772))
-- adds test and fix for conversion to use numeric ([#17758](https://github.com/MetaMask/metamask-extension/pull/17758))
-- Version v10.26.0
-- Sync `master` with `develop` ([#17665](https://github.com/MetaMask/metamask-extension/pull/17665))
-- Deprecating Typography component ([#17672](https://github.com/MetaMask/metamask-extension/pull/17672))
-- Add testing documentation ([#17411](https://github.com/MetaMask/metamask-extension/pull/17411))
-- Merge branch 'develop' into master-sync
-- Merge branch 'develop' into master-sync
-- fix test of useTransactionDisplayData for different timezone ([#17063](https://github.com/MetaMask/metamask-extension/pull/17063))
-- Conflict cleanup 10.25.0 master-sync
-- Merge remote-tracking branch 'origin/develop' into master-sync
-- Expand network controller unit test coverage ([#17498](https://github.com/MetaMask/metamask-extension/pull/17498))
-- Detect and track UI customizations on Personal Sign Requests ([#16222](https://github.com/MetaMask/metamask-extension/pull/16222))
-- Sign-in with Ethereum Domain Binding ([#16616](https://github.com/MetaMask/metamask-extension/pull/16616))
-- Update `json-rpc-middleware-stream` from v2 to v4 ([#17588](https://github.com/MetaMask/metamask-extension/pull/17588))
-- converted collectibles files to nfts ([#17658](https://github.com/MetaMask/metamask-extension/pull/17658))
-- E2e test insights ([#17535](https://github.com/MetaMask/metamask-extension/pull/17535))
-- [TS dashboard] Reorganize files slightly ([#17335](https://github.com/MetaMask/metamask-extension/pull/17335))
-- add brad-decker as codeowner of .circle/ folder ([#17648](https://github.com/MetaMask/metamask-extension/pull/17648))
-- Refactor ConfirmTransaction to Functional Component ([#17473](https://github.com/MetaMask/metamask-extension/pull/17473))
-- Add desktop build type ([#17592](https://github.com/MetaMask/metamask-extension/pull/17592))
-- add double arrow icons ([#17654](https://github.com/MetaMask/metamask-extension/pull/17654))
-- Add e2e test: send nft  ([#17638](https://github.com/MetaMask/metamask-extension/pull/17638))
-- Adding docs for layout and spacing for Icon component ([#17612](https://github.com/MetaMask/metamask-extension/pull/17612))
-- Collectible Unit Tests ([#17632](https://github.com/MetaMask/metamask-extension/pull/17632))
-- Update BannerAlert component ([#17586](https://github.com/MetaMask/metamask-extension/pull/17586))
-- [FLASK] Create E2E test for RPC endowment ([#17525](https://github.com/MetaMask/metamask-extension/pull/17525))
-- Added metric Phishing Page Displayed for phishing warning page ([#17462](https://github.com/MetaMask/metamask-extension/pull/17462))
-- updated assets and phishing controller packages ([#17569](https://github.com/MetaMask/metamask-extension/pull/17569))
-- Prevent lint warning in ActionableMessage ([#17598](https://github.com/MetaMask/metamask-extension/pull/17598))
-- [doc] add Jest debugging guide (docs/tests/jest.md) ([#17594](https://github.com/MetaMask/metamask-extension/pull/17594))
-- NFTs: Update event name for Detect NFT settings ([#17597](https://github.com/MetaMask/metamask-extension/pull/17597))
-- Change COLORS reference to Color ([#17599](https://github.com/MetaMask/metamask-extension/pull/17599))
-- UX: Remove the IconCopy and IconCopied Components and their usages ([#17530](https://github.com/MetaMask/metamask-extension/pull/17530))
-- Convert actions.js to typescript ([#17446](https://github.com/MetaMask/metamask-extension/pull/17446))
-- Disable fiat conversion in Approve Screen when `Show balance and token price checker` is OFF ([#17443](https://github.com/MetaMask/metamask-extension/pull/17443))
-- Ensure the advanced gas modal displays a zero priority fee if that is how it is set in the transaction ([#17559](https://github.com/MetaMask/metamask-extension/pull/17559))
-- feature: convert ui/ducks/app/app.ts to typescript ([#17454](https://github.com/MetaMask/metamask-extension/pull/17454))
-- Fix speed up of 0 max priority fee transactions ([#17547](https://github.com/MetaMask/metamask-extension/pull/17547))
-- update banner base component ([#17582](https://github.com/MetaMask/metamask-extension/pull/17582))
-- decrease coverage threshold that requires bump ([#17544](https://github.com/MetaMask/metamask-extension/pull/17544))
-- Dead and redundant code removal ([#17512](https://github.com/MetaMask/metamask-extension/pull/17512))
-- initialize currentLocale in the locale slice upon app start ([#17579](https://github.com/MetaMask/metamask-extension/pull/17579))
-- fix: fix non-critical warning in tests ([#17567](https://github.com/MetaMask/metamask-extension/pull/17567))
-- feature: migrate design-system.ts ([#17518](https://github.com/MetaMask/metamask-extension/pull/17518))
-- Convert store.js to typescript and redux toolkit ([#17508](https://github.com/MetaMask/metamask-extension/pull/17508))
-- Add error module for safely handling errors ([#17511](https://github.com/MetaMask/metamask-extension/pull/17511))
-- Convert action-queue to TypeScript ([#17509](https://github.com/MetaMask/metamask-extension/pull/17509))
-- Add network client tests for methods not supported by Infura ([#17347](https://github.com/MetaMask/metamask-extension/pull/17347))
-- Add e2e test:  import nft ([#17543](https://github.com/MetaMask/metamask-extension/pull/17543))
-- Convert confirm-tx.utils.js to typescript ([#17349](https://github.com/MetaMask/metamask-extension/pull/17349))
-- updated CollectibleDetail Storybook Coverage ([#17351](https://github.com/MetaMask/metamask-extension/pull/17351))
-- adding textfix on experimental tab ([#17306](https://github.com/MetaMask/metamask-extension/pull/17306))
-- Allow background to handle forgotten password flow ([#17501](https://github.com/MetaMask/metamask-extension/pull/17501))
-- GasDisplay: fix z-index for Confirm Approve warning ([#17470](https://github.com/MetaMask/metamask-extension/pull/17470))
-- Detailed document for refactoring signature request pages in extension ([#17456](https://github.com/MetaMask/metamask-extension/pull/17456))
-- Move confirm-transaction/conf-tx.js to confirm-signature-request ([#17408](https://github.com/MetaMask/metamask-extension/pull/17408))
-- remove nft toaster on first autohide ([#17536](https://github.com/MetaMask/metamask-extension/pull/17536))
-- Convert ui/store/actionConstants.js -> Typescript ([#17442](https://github.com/MetaMask/metamask-extension/pull/17442))
-- Fixing yarn version command, adding yarn version plugin ([#17325](https://github.com/MetaMask/metamask-extension/pull/17325))
-- 🐛 Calldata validation ([#17326](https://github.com/MetaMask/metamask-extension/pull/17326))
-- remove unused banner base proptype ([#17531](https://github.com/MetaMask/metamask-extension/pull/17531))
-- Add tests for `retryOnEmpty` middleware ([#17364](https://github.com/MetaMask/metamask-extension/pull/17364))
-- prefer locale slice for locale state ([#17499](https://github.com/MetaMask/metamask-extension/pull/17499))
-- Fixing/extending type definitions for later usage ([#17514](https://github.com/MetaMask/metamask-extension/pull/17514))
-- TypeScript tooling fixes ([#17513](https://github.com/MetaMask/metamask-extension/pull/17513))
-- Onboarding V2: Remove old onboarding flow ([#17081](https://github.com/MetaMask/metamask-extension/pull/17081))
-- Fix build ([#17538](https://github.com/MetaMask/metamask-extension/pull/17538))
-- fix button text props ([#17478](https://github.com/MetaMask/metamask-extension/pull/17478))
-- Refactoring confirm-transaction-base component ([#17484](https://github.com/MetaMask/metamask-extension/pull/17484))
-- Refactor conf-tx.js ([#17380](https://github.com/MetaMask/metamask-extension/pull/17380))
-- Move THEME_TYPE to new preferences.ts file ([#17515](https://github.com/MetaMask/metamask-extension/pull/17515))
-- Fix #17328 - Move NFT settings to Experimental ([#17400](https://github.com/MetaMask/metamask-extension/pull/17400))
-- UX - Update all copy icons ([#17445](https://github.com/MetaMask/metamask-extension/pull/17445))
-- Fix #17393 - Fix NFT collection header image ([#17394](https://github.com/MetaMask/metamask-extension/pull/17394))
-- Add e2e test: add custome network during onboarding ([#17436](https://github.com/MetaMask/metamask-extension/pull/17436))
-- feat(mme-17214): migrate L33 files to typescript ([#17372](https://github.com/MetaMask/metamask-extension/pull/17372))
-- master sync following v10.24.2 ([#17504](https://github.com/MetaMask/metamask-extension/pull/17504))
-- Merge remote-tracking branch 'origin/develop' into master-sync
-- Document `displayWarning` as deprecated ([#17465](https://github.com/MetaMask/metamask-extension/pull/17465))
-- Ignore `storybook-build` lint errors ([#17373](https://github.com/MetaMask/metamask-extension/pull/17373))
-- Nft build for e2e tests ([#17430](https://github.com/MetaMask/metamask-extension/pull/17430))
-- feature: convert level 32 files to typescript ([#17390](https://github.com/MetaMask/metamask-extension/pull/17390))
-- [e2e]Add e2e test for deleting custom network ([#17254](https://github.com/MetaMask/metamask-extension/pull/17254))
-- Fix #17362 - Ensure NFT icons are correct ([#17440](https://github.com/MetaMask/metamask-extension/pull/17440))
-- Fix #17385 - Provide autohide callback for ActionMessage ([#17392](https://github.com/MetaMask/metamask-extension/pull/17392))
-- button link housekeeping ([#16885](https://github.com/MetaMask/metamask-extension/pull/16885))
-- Bump lavapack version to 5 ([#17431](https://github.com/MetaMask/metamask-extension/pull/17431))
-- feature: convert shared/modules/contract-utils.test.js to typescript ([#17435](https://github.com/MetaMask/metamask-extension/pull/17435))
-- Refactor confirm page container component from class to functional component ([#16907](https://github.com/MetaMask/metamask-extension/pull/16907))
-- Test parameter change cache miss ([#17346](https://github.com/MetaMask/metamask-extension/pull/17346))
-- Document callback-style background calls as deprecated ([#17376](https://github.com/MetaMask/metamask-extension/pull/17376))
-- Put hardware wallets behind an HARDWARE_WALLETS_MV3 flag ([#17354](https://github.com/MetaMask/metamask-extension/pull/17354))
-- Consolidated all component import paths ([#17368](https://github.com/MetaMask/metamask-extension/pull/17368))
-- updated new links for the stories ([#17369](https://github.com/MetaMask/metamask-extension/pull/17369))
-- Fix #17388 - Remove dismiss button from NFT notification ([#17389](https://github.com/MetaMask/metamask-extension/pull/17389))
-- Feat/15086/add banner severities component ([#17307](https://github.com/MetaMask/metamask-extension/pull/17307))
-- fix icon names ([#17391](https://github.com/MetaMask/metamask-extension/pull/17391))
-- Fix Playwright install step ([#17415](https://github.com/MetaMask/metamask-extension/pull/17415))
-- Fix broken NFT import and auto-detect flows ([#17384](https://github.com/MetaMask/metamask-extension/pull/17384))
-- Convert ui/helpers/constants/common to typescript ([#17348](https://github.com/MetaMask/metamask-extension/pull/17348))
-- Add alt text for NFT images ([#17284](https://github.com/MetaMask/metamask-extension/pull/17284))
-- Nit fixes for story-test integration ([#17344](https://github.com/MetaMask/metamask-extension/pull/17344))
-- remove duplicate comment line ([#17381](https://github.com/MetaMask/metamask-extension/pull/17381))
-- Complete level 36 migration of TypeScript by converting conversion.utils.js and deprecate old conversion util ([#17262](https://github.com/MetaMask/metamask-extension/pull/17262))
-- icon audit, remove xxs icon size ([#17089](https://github.com/MetaMask/metamask-extension/pull/17089))
-- Activate LavaMoat scuttling security feature ([#17276](https://github.com/MetaMask/metamask-extension/pull/17276))
-- feat(mme-17212): convert shared/constants/swaps.js -> Typescript ([#17322](https://github.com/MetaMask/metamask-extension/pull/17322))
-- Add Firefox Snow support ([#17147](https://github.com/MetaMask/metamask-extension/pull/17147))
-- Move subject type enum to `@metamask/subject-metadata-controller` ([#16431](https://github.com/MetaMask/metamask-extension/pull/16431))
-- Replace usages of conversion util in rest of UI folder in favor of Numeric ([#17334](https://github.com/MetaMask/metamask-extension/pull/17334))
-- Fix/use etherjs specific imports ([#15461](https://github.com/MetaMask/metamask-extension/pull/15461))
-- Fix #17300, #16843 - Use proper source for image of IPFS NFTs ([#17302](https://github.com/MetaMask/metamask-extension/pull/17302))
-- Sync `master` with `develop` ([#17359](https://github.com/MetaMask/metamask-extension/pull/17359))
-- [FLASK] `snaps-monorepo@0.28.0` ([#17277](https://github.com/MetaMask/metamask-extension/pull/17277))
-- Remove usages of Conversion util in components folder in favor of Numeric ([#17333](https://github.com/MetaMask/metamask-extension/pull/17333))
-- Refactor Errors E2E test to no longer rely upon a real error ([#17332](https://github.com/MetaMask/metamask-extension/pull/17332))
-- Merge remote-tracking branch 'origin/develop' into master-sync
-- Fix cookiejar dependency vulnerability ([#17355](https://github.com/MetaMask/metamask-extension/pull/17355))
-- Refactor usages of conversion util in the app folder and shared folder in favor of Numeric ([#17331](https://github.com/MetaMask/metamask-extension/pull/17331))
-- Updated Icons in Title of NFTs ([#17205](https://github.com/MetaMask/metamask-extension/pull/17205))
-- Convert app//scripts/lib/util.js to typescript ([#17330](https://github.com/MetaMask/metamask-extension/pull/17330))
-- Security provider check (OpenSea) ([#16584](https://github.com/MetaMask/metamask-extension/pull/16584))
-- Setup network controller mocks per-test ([#17250](https://github.com/MetaMask/metamask-extension/pull/17250))
-- Added toaster for removed NFTs ([#17297](https://github.com/MetaMask/metamask-extension/pull/17297))
-- Integrate `KeyringController` v10 ([#17056](https://github.com/MetaMask/metamask-extension/pull/17056))
-- add numeric module ([#17324](https://github.com/MetaMask/metamask-extension/pull/17324))
-- Convert app/scripts/constants -> Typescript ([#17327](https://github.com/MetaMask/metamask-extension/pull/17327))
-- Use async/await instead of Promise.resolve ([#16221](https://github.com/MetaMask/metamask-extension/pull/16221))
-- Added storybook check to CI ([#17092](https://github.com/MetaMask/metamask-extension/pull/17092))
-- feat(mme-17212): convert shared/module/string-utils.js -> Typescript ([#17320](https://github.com/MetaMask/metamask-extension/pull/17320))
-- Relocate conversion utils to shared/modules/conversion.utils.js ([#17319](https://github.com/MetaMask/metamask-extension/pull/17319))
-- fix script for linting changed files ([#17028](https://github.com/MetaMask/metamask-extension/pull/17028))
-- Convert shared/constants/hardware-wallets.js -> Typescript ([#17310](https://github.com/MetaMask/metamask-extension/pull/17310))
-- Convert shared/constants/labels.js -> Typescript ([#17309](https://github.com/MetaMask/metamask-extension/pull/17309))
+### Fixed
+- Fix main build by modifying desktop build steps ([#18112](https://github.com/MetaMask/metamask-extension/pull/18112))
 
 ## [10.26.0]
 ### Added

From 094c5582e66c5350d04c00ae8a140efdc2a9b8aa Mon Sep 17 00:00:00 2001
From: PeterYinusa <peter.yinusa@consensys.net>
Date: Tue, 14 Mar 2023 12:06:48 +0000
Subject: [PATCH 35/36] Revert "patch lavamoat files to make v10.26.0
 compatible with v78 of chrome (#18053)"

This reverts commit 8c550e78e9b79e3ce729865f9ab99cf3b24c0ff6.
---
 .../@lavamoat-snow-npm-1.4.1-405a48e593.patch |  9 ----
 .../lavamoat-core-npm-12.4.0-cecca1a9b5.patch | 14 ------
 .../lavamoat-core-npm-14.0.0-0f5bdac846.patch | 16 -------
 app/scripts/use-snow.js                       |  2 +-
 development/build/index.js                    |  1 -
 package.json                                  |  6 +--
 yarn.lock                                     | 47 +++----------------
 7 files changed, 9 insertions(+), 86 deletions(-)
 delete mode 100644 .yarn/patches/@lavamoat-snow-npm-1.4.1-405a48e593.patch
 delete mode 100644 .yarn/patches/lavamoat-core-npm-12.4.0-cecca1a9b5.patch
 delete mode 100644 .yarn/patches/lavamoat-core-npm-14.0.0-0f5bdac846.patch

diff --git a/.yarn/patches/@lavamoat-snow-npm-1.4.1-405a48e593.patch b/.yarn/patches/@lavamoat-snow-npm-1.4.1-405a48e593.patch
deleted file mode 100644
index 634cda891..000000000
--- a/.yarn/patches/@lavamoat-snow-npm-1.4.1-405a48e593.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/snow.prod.js b/snow.prod.js
-index 2887e42dced838685e5b8f76d2c2f953fb808200..7fdac0cb49b5653371cecc4e2655999ad183047b 100644
---- a/snow.prod.js
-+++ b/snow.prod.js
-@@ -1 +1 @@
--(function(){"use strict";(()=>{var e={586:(e,t,n)=>{const r=n(228),{getFramesArray:o,getFrameTag:i}=n(648),{getOnload:c,setOnload:a,removeAttribute:s,addEventListener:u}=n(14);function l(e){if(!i(e))return;u(e,"load",(function(){r(e)}));const t=c(e);t&&(a(e,null),s(e,"onload"),a(e,t))}e.exports=function(e){for(let t=0;t<e.length;t++){const n=e[t],r=o(n,!0);for(let e=0;e<r.length;e++)l(r[e])}}},750:e=>{e.exports=function(e){e&&e.contentWindow}},832:(e,t,n)=>{const{Object:r,Function:o}=n(14),{isTagFramable:i}=n(648),{error:c,ERR_EXTENDING_FRAMABLES_BLOCKED:a}=n(312);e.exports=function(e){const t=r.getOwnPropertyDescriptor(e.CustomElementRegistry.prototype,"define");t.configurable=t.writable=!0;const n=t.value;var s;t.value=(s=n,function(e,t,n){let r=n;if(n){const t=n.extends;i(t+"")&&c(a,e,n)&&(r=void 0)}return o.prototype.call.call(s,this,e,t,r)}),r.defineProperty(e.CustomElementRegistry.prototype,"define",t)}},228:(e,t,n)=>{const r=n(851),o=n(750),{shadows:i,toArray:c,getFramesArray:a,getContentWindowOfFrame:s,getOwnerWindowOfNode:u}=n(648),{Object:l,getFrameElement:p}=n(14);function f(e,t){let n=-1;for(;e[++n];){if(r(e[n],e,l))continue;if(p(e[n])===t)return e[n];const o=f(e[n],t);if(o)return o}for(let n=0;n<i.length;n++){const r=i[n];if(u(r)!==e)continue;const o=a(r,!1);for(let e=0;e<o.length;e++){const n=o[e],r=s(n);if(n===t)return r;const i=f(r,t);if(i)return i}}return null}e.exports=function(e){e=c(e);for(let t=0;t<e.length;t++){const n=e[t];if("object"!=typeof n)continue;o(n);const r=f(top,n);r&&top.SNOW_WINDOW(r)}}},328:(e,t,n)=>{const{getFramesArray:r}=n(648),{Array:o,stringToLowerCase:i,split:c,getAttribute:a,setAttribute:s,getTemplateContent:u,getChildElementCount:l,createElement:p,getInnerHTML:f,setInnerHTML:m,remove:g,DocumentFragment:d}=n(14),{warn:y,WARN_DECLARATIVE_SHADOWS:w}=n(312),E=d.prototype.querySelectorAll;function O(e,t){let n="top."+(e?"SNOW_FRAME":"SNOW_WINDOW")+"(this);";return t&&(n="<script>"+n+"document.currentScript.remove();<\/script>"),n}function h(e){let t=a(e,"onload");return!!t&&(t=O(!0,!1)+t,s(e,"onload",t),!0)}function v(e){let t=a(e,"src")||"";const[n,r]=c(t,":");return"javascript"===i(n)&&(t="javascript:"+O(!1,!1)+r,s(e,"src",t),!0)}function D(e){let t=a(e,"srcdoc");if(t){t=O(!1,!0)+t;const n=new o(t);return _(n,!0),s(e,"srcdoc",n[0]),!0}return!1}function _(e,t){for(let i=0;i<e.length;i++){const c=p(document,"template");m(c,e[i]);const a=u(c);if(!l(a))continue;let s=!1;if(t){const e=p(document,"script");e.textContent=O(!1,!1),a.insertBefore(e,a.firstChild),s=!0}const d=E.call(a,"template[shadowroot]");for(let t=0;t<d.length;t++)n=d[t],o=e[i],y(w,n,o),g(n),s=!0;const _=r(a,!1);for(let e=0;e<_.length;e++){const t=_[e];s=h(t)||s,s=v(t)||s,s=D(t)||s}s&&(e[i]=f(c))}var n,o}e.exports={handleHTML:_}},352:(e,t,n)=>{const r=n(228),o=n(832),i=n(583),c=n(459),a=n(58),{hookShadowDOM:s}=n(373),{Object:u,addEventListener:l,getFrameElement:p}=n(14),{isMarked:f,mark:m}=n(111),{error:g,ERR_PROVIDED_CB_IS_NOT_A_FUNCTION:d,ERR_MARK_NEW_WINDOW_FAILED:y}=n(312);function w(e,t){const n=u.create(null);n.value=t,u.defineProperty(top,e,n)}function E(e){try{const t=!f(e);return t&&m(e),t}catch(t){g(y,e,t)}return E(e)}function O(e){E(e)&&(function(e){!function(e){const t=p(e);l(t,"load",(function(){r(t)}))}(e),o(e),i(e),c(e,"load"),a(e),s(e)}(e),h(e))}let h;e.exports=function(e,t){if(!h){if("function"!=typeof e&&g(d,e))return;w("SNOW_WINDOW",(function(e){O(e)})),w("SNOW_FRAME",(function(e){r(e)})),h=e}O(t||top)}},58:(e,t,n)=>{const{protectShadows:r}=n(373),o=n(586),{getFramesArray:i,shadows:c}=n(648),{getParentElement:a,slice:s,Object:u,Function:l}=n(14),{handleHTML:p}=n(328),f=n(228),m={DocumentFragment:["replaceChildren","append","prepend"],Document:["replaceChildren","append","prepend","write","writeln"],Node:["appendChild","insertBefore","replaceChild"],Element:["innerHTML","outerHTML","insertAdjacentHTML","replaceWith","insertAdjacentElement","append","before","prepend","after","replaceChildren"],ShadowRoot:["innerHTML"],HTMLIFrameElement:["srcdoc"]};function g(e,t){function n(e){o(e),o(c),p(e,t)}function u(e,t){const n=i(t,!1);f(n),f(e),r(!0)}return function(){const t=s(arguments),r=a(this)||this;n(t);const o=l.prototype.apply.call(e,this,t);return u(t,r),o}}e.exports=function(e){for(const t in m){const n=m[t];for(let r=0;r<n.length;r++){const o=n[r],i=u.getOwnPropertyDescriptor(e[t].prototype,o),c=i.set?"set":"value";i[c]=g(i[c],"srcdoc"===o),i.configurable=!0,"value"===c&&(i.writable=!0),u.defineProperty(e[t].prototype,o,i)}}}},459:(e,t,n)=>{const r=n(228),{removeEventListener:o,addEventListener:i,slice:c,Map:a,Object:s}=n(14),u=new a;function l(e,t,n){if(t)return t.handleEvent?t.handleEvent.apply(t,n):t.apply(e,n)}function p(e,t){return function(n,o,a){let s=o;return n===t&&(u.has(o)||u.set(o,(function(){r(this);const e=c(arguments);l(this,o,e)})),s=u.get(o)),i(this||e,n,s,a)}}function f(e,t){return function(n,r,i){let c=r;return n===t&&(c=u.get(r),u.delete(r)),o(this||e,n,c,i)}}e.exports=function(e,t){s.defineProperty(e.EventTarget.prototype,"addEventListener",{configurable:!0,writable:!0,value:p(e,t)}),s.defineProperty(e.EventTarget.prototype,"removeEventListener",{configurable:!0,writable:!0,value:f(e,t)})}},312:(e,t,n)=>{const{console:r}=n(14);e.exports={warn:function(e,t,n){let o;switch(e){case 5:const e=t,i=n;o=!1,r.warn("SNOW:","removing html string representing a declarative shadow:",e,"\n",`"${i}"`,".","\n","if this prevents your application from running correctly, please visit/report at","https://github.com/LavaMoat/snow/issues/32#issuecomment-1239273328",".");break;case 3:const c=t,a=n;o=!0,r.warn("SNOW:",o?"":"NOT",'blocking open attempt to "javascript:" url:',c,"by window: ",a,".","\n","if this prevents your application from running correctly, please visit/report at","https://github.com/LavaMoat/snow/issues/44#issuecomment-1369687802",".");break;case 2:const s=t,u=n;o=!0,r.warn("SNOW:","blocking access to property:",`"${s}"`,"of opened window: ",u,".","\n","if this prevents your application from running correctly, please visit/report at","https://github.com/LavaMoat/snow/issues/2#issuecomment-1239264255",".")}return o},error:function(e,t,n){let o;switch(e){case 6:const e=t,i=n;o=!0,r.error("SNOW:",`"${e}"`,"extending attempt","of framable elements such as provided",i,"is blocked to prevent bypass",".","\n","if this prevents your application from running correctly, please visit/report at","https://github.com/LavaMoat/snow/issues/56#issuecomment-1374899809",".","\n");break;case 1:const c=t,a=n;o=!0,r.error("SNOW:","failed to mark new window:",c,".","\n","if this prevents your application from running correctly, please visit/report at","https://github.com/LavaMoat/snow/issues/33#issuecomment-1239280063",".","\n","in order to maintain a bulletproof defense mechanism, failing to mark a new window typically causes an infinite loop",".","\n","error caught:","\n",a);break;case 4:const s=t;o=!0,r.error("SNOW:",'first argument must be of type "function", instead got:',s,".","\n","therefore, snow bailed and is not applied to the page until this is fixed.")}return o},ERR_MARK_NEW_WINDOW_FAILED:1,WARN_OPEN_API_LIMITED:2,WARN_OPEN_API_URL_ARG_JAVASCRIPT_SCHEME:3,ERR_PROVIDED_CB_IS_NOT_A_FUNCTION:4,WARN_DECLARATIVE_SHADOWS:5,ERR_EXTENDING_FRAMABLES_BLOCKED:6}},111:(e,t,n)=>{const{Map:r,Object:o,Array:i}=n(14),c=new i,a=new r;e.exports={isMarked:function(e){if(!a.has(e))return!1;const t=o.getOwnPropertyDescriptor(e,"SNOW_ID");if(!t||!o.hasOwnProperty.call(t,"value"))return!1;if("function"!=typeof t.value)return!1;const n=a.get(e);return t.value(c)===n},mark:function(e){const t=new i,n=o.create(null);n.value=e=>e===c&&t,o.defineProperty(e,"SNOW_ID",n),a.set(e,t)}}},14:e=>{e.exports=function(e){const t=function(e){const{EventTarget:t}=e;return function(e,n){const r=e.document.createElement("iframe");(e.document.head||e.document.documentElement).appendChild(r);const o=function(e){const{console:n,Proxy:r,JSON:o,Attr:i,String:c,Function:a,Map:s,Node:u,Document:l,DocumentFragment:p,ShadowRoot:f,Object:m,Reflect:g,Array:d,Element:y,HTMLElement:w,HTMLTemplateElement:E,HTMLIFrameElement:O,HTMLFrameElement:h,HTMLObjectElement:v}=e,D={console:n,Proxy:r,JSON:o,Attr:i,String:c,Function:a,Map:s,Node:u,Document:l,DocumentFragment:p,ShadowRoot:f,Object:m,Reflect:g,Array:d,Element:y,HTMLElement:w,HTMLTemplateElement:E,EventTarget:t,HTMLIFrameElement:O,HTMLFrameElement:h,HTMLObjectElement:v};return D.document={createElement:e.document.createElement},D}(r.contentWindow);return r.parentElement.removeChild(r),o}(e)}(e),{console:n,Proxy:r,Function:o,String:i,Map:c,Node:a,Document:s,DocumentFragment:u,ShadowRoot:l,Object:p,Reflect:f,Array:m,Element:g,HTMLElement:d,HTMLTemplateElement:y,EventTarget:w,HTMLIFrameElement:E,HTMLFrameElement:O,HTMLObjectElement:h}=t;return p.assign(t,{iframeContentWindow:p.getOwnPropertyDescriptor(E.prototype,"contentWindow").get,frameContentWindow:p.getOwnPropertyDescriptor(O.prototype,"contentWindow").get,objectContentWindow:p.getOwnPropertyDescriptor(h.prototype,"contentWindow").get,createElement:p.getOwnPropertyDescriptor(s.prototype,"createElement").value,slice:p.getOwnPropertyDescriptor(m.prototype,"slice").value,split:p.getOwnPropertyDescriptor(i.prototype,"split").value,nodeType:p.getOwnPropertyDescriptor(a.prototype,"nodeType").get,tagName:p.getOwnPropertyDescriptor(g.prototype,"tagName").get,getInnerHTML:p.getOwnPropertyDescriptor(g.prototype,"innerHTML").get,setInnerHTML:p.getOwnPropertyDescriptor(g.prototype,"innerHTML").set,toString:p.getOwnPropertyDescriptor(p.prototype,"toString").value,getOnload:p.getOwnPropertyDescriptor(d.prototype,"onload").get,setOnload:p.getOwnPropertyDescriptor(d.prototype,"onload").set,getAttribute:p.getOwnPropertyDescriptor(g.prototype,"getAttribute").value,setAttribute:p.getOwnPropertyDescriptor(g.prototype,"setAttribute").value,removeAttribute:p.getOwnPropertyDescriptor(g.prototype,"removeAttribute").value,remove:p.getOwnPropertyDescriptor(g.prototype,"remove").value,addEventListener:p.getOwnPropertyDescriptor(w.prototype,"addEventListener").value,removeEventListener:p.getOwnPropertyDescriptor(w.prototype,"removeEventListener").value,getTemplateContent:p.getOwnPropertyDescriptor(y.prototype,"content").get,getChildElementCount:p.getOwnPropertyDescriptor(u.prototype,"childElementCount").get,getFrameElement:p.getOwnPropertyDescriptor(e,"frameElement").get,getParentElement:p.getOwnPropertyDescriptor(a.prototype,"parentElement").get,getOwnerDocument:p.getOwnPropertyDescriptor(a.prototype,"ownerDocument").get,getDefaultView:p.getOwnPropertyDescriptor(s.prototype,"defaultView").get}),{console:n,Proxy:r,Object:p,Reflect:f,Function:o,Node:a,Element:g,Document:s,DocumentFragment:u,ShadowRoot:l,Array:m,Map:c,getContentWindow:function(e,n){switch(n){case"IFRAME":return t.iframeContentWindow.call(e);case"FRAME":return t.frameContentWindow.call(e);case"OBJECT":return t.objectContentWindow.call(e);default:return null}},stringToLowerCase:function(e){return t.String.prototype.toLowerCase.call(e)},stringStartsWith:function(e,n){return t.String.prototype.startsWith.call(e,n)},parse:function(e,n){return t.JSON.parse(e,n)},stringify:function(e,n,r){return t.JSON.stringify(e,n,r)},slice:function(e,n,r){return t.slice.call(e,n,r)},split:function(e,n){return t.split.call(e,n)},nodeType:function(e){return t.nodeType.call(e)},tagName:function(e){return t.tagName.call(e)},toString:function(e){return t.toString.call(e)},getOnload:function(e){return t.getOnload.call(e)},setOnload:function(e,n){return t.setOnload.call(e,n)},remove:function(e){return t.remove.call(e)},removeAttribute:function(e,n){return t.removeAttribute.call(e,n)},getAttribute:function(e,n){return t.getAttribute.call(e,n)},setAttribute:function(e,n,r){return t.setAttribute.call(e,n,r)},addEventListener:function(e,n,r,o){return t.addEventListener.call(e,n,r,o)},removeEventListener:function(e,n,r,o){return t.removeEventListener.call(e,n,r,o)},createElement:function(e,n,r){return t.createElement.call(e,n,r)},getInnerHTML:function(e){return t.getInnerHTML.call(e)},setInnerHTML:function(e,n){return t.setInnerHTML.call(e,n)},getTemplateContent:function(e){return t.getTemplateContent.call(e)},getChildElementCount:function(e){return t.getChildElementCount.call(e)},getFrameElement:function(e){return t.Function.prototype.call.call(t.getFrameElement,e)},getParentElement:function(e){return t.getParentElement.call(e)},getOwnerDocument:function(e){return t.getOwnerDocument.call(e)},getDefaultView:function(e){return t.getDefaultView.call(e)}}}(top)},583:(e,t,n)=>{const{stringToLowerCase:r,stringStartsWith:o,slice:i,Function:c,Object:a,Reflect:s,Proxy:u,Map:l}=n(14),{warn:p,WARN_OPEN_API_LIMITED:f,WARN_OPEN_API_URL_ARG_JAVASCRIPT_SCHEME:m}=n(312),g=new l;function d(e,t){const n=new a(null);return a.defineProperty(n,"closed",{get:function(){return t.closed}}),a.defineProperty(n,"close",{value:function(){return t.close()}}),a.defineProperty(n,"focus",{value:function(){return t.focus()}}),a.defineProperty(n,"postMessage",{value:function(e,n,r){return t.postMessage(e,n,r)}}),new u(n,{get:function(n,r){let o=s.get(n,r);return s.has(n,r)||s.has(t,r)&&(p(f,r,e)||(o=s.get(t,r))),o},set:function(){}})}e.exports=function(e){!function(e){const t=a.getOwnPropertyDescriptor(e.MessageEvent.prototype,"source"),n=t.get;t.get=function(){const e=n.call(this);return g.get(e)||e},a.defineProperty(e.MessageEvent.prototype,"source",t)}(e),e.open=function(e,t){return function(){const n=i(arguments),a=n[0]+"",s=n[1],u=n[2];if(o(r(a),"javascript")&&p(m,a,e))return null;const l=c.prototype.call.call(t,this,a,s,u);if(!l)return null;top.SNOW_WINDOW(l);const f=d(e,l);return g.set(l,f),f}}(e,e.open)}},373:(e,t,n)=>{const r=n(228),{getFramesArray:o,shadows:i}=n(648),{Object:c,Function:a}=n(14);function s(e){for(let t=0;t<i.length;t++){const n=i[t];if(e&&!n.isConnected)continue;const c=o(n,!1);r(c)}}e.exports={hookShadowDOM:function(e){const t=c.getOwnPropertyDescriptor(e.Element.prototype,"attachShadow");t.configurable=t.writable=!0;const n=t.value;var r;t.value=(r=n,function(e){const t=a.prototype.call.call(r,this,e);return i.push(t),s(!0),t}),c.defineProperty(e.Element.prototype,"attachShadow",t)},protectShadows:s}},648:(e,t,n)=>{const{tagName:r,nodeType:o,slice:i,Array:c,parse:a,stringify:s,Node:u,Document:l,DocumentFragment:p,Element:f,ShadowRoot:m,getContentWindow:g,getDefaultView:d,getOwnerDocument:y,stringToLowerCase:w}=n(14),E=new c;function O(e){return E.includes(e)}function h(e){const t=w(e);return"iframe"===t||"frame"===t||"object"===t||"embed"===t}function v(e){if(!e||"object"!=typeof e)return null;if(o(e)!==f.prototype.ELEMENT_NODE)return null;if(O(e))return null;const t=r(e);return h(t)?t:null}function D(e){return c.isArray(e)||(e=new c(e)),e}function _(e,t){let n=!1;for(let r=0;r<t.length;r++)e.includes(t[r])||(e.push(t[r]),n=!0);return n}e.exports={toArray:D,isTagFramable:h,getOwnerWindowOfNode:function(e){return d(y(e))},getContentWindowOfFrame:function(e){return g(e,v(e))},getFramesArray:function(e,t){const n=new c;if(null===e||"object"!=typeof e)return n;if("string"==typeof a(s(r=e,((e,t)=>e||r!==t?"":t)))||!function(e){if(O(e))return!0;const t=o(e);return t===f.prototype.ELEMENT_NODE||t===f.prototype.DOCUMENT_FRAGMENT_NODE||t===f.prototype.DOCUMENT_NODE}(e))return n;var r;const g=function(e){if(O(e))return m;switch(o(e)){case u.prototype.DOCUMENT_NODE:return l;case u.prototype.DOCUMENT_FRAGMENT_NODE:return p;default:return f}}(e).prototype.querySelectorAll.call(e,"iframe,frame,object,embed");return _(n,i(g)),t&&_(n,D(e)),n},getFrameTag:v,shadows:E}},626:e=>{e.exports={SRC_IS_NOT_A_WINDOW:'provided argument "src" must be a proper window of instance Window',DST_IS_NOT_A_WINDOW:'provided argument "dst" must be a proper window of instance Window',SRC_IS_NOT_SAME_ORIGIN_AS_WINDOW:'provided argument "src" must be a window in the same origin as the current context window'}},851:(e,t,n)=>{const{DST_IS_NOT_A_WINDOW:r,SRC_IS_NOT_A_WINDOW:o,SRC_IS_NOT_SAME_ORIGIN_AS_WINDOW:i}=n(626);function c(e,t){const n=t(e);return n===n.window}function a(e,t,n){return null===n.getPrototypeOf.call(t,e)}e.exports=function(e,t=window,n=window.Object){if(!c(t,n))throw new Error(o);if(!c(e,n))throw new Error(r);if(a(window,t,n))throw new Error(i);return a(e,t,n)}}},t={};function n(r){var o=t[r];if(void 0!==o)return o.exports;var i=t[r]={exports:{}};return e[r](i,i.exports,n),i.exports}n.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return n.d(t,{a:t}),t},n.d=(e,t)=>{for(var r in t)n.o(t,r)&&!n.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},n.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{"use strict";var e,t=n(352),r=n.n(t);e=top,Object.defineProperty(e,"SNOW",{value:r()})})()})();}())
-\ No newline at end of file
-+(function(){"use strict";(()=>{var e={586:(e,t,n)=>{const r=n(228),{getFramesArray:o,getFrameTag:i}=n(648),{getOnload:c,setOnload:a,removeAttribute:s,addEventListener:u}=n(14);function l(e){if(!i(e))return;u(e,"load",(function(){r(e)}));const t=c(e);t&&(a(e,null),s(e,"onload"),a(e,t))}e.exports=function(e){for(let t=0;t<e.length;t++){const n=e[t],r=o(n,!0);for(let e=0;e<r.length;e++)l(r[e])}}},750:e=>{e.exports=function(e){e&&e.contentWindow}},832:(e,t,n)=>{const{Object:r,Function:o}=n(14),{isTagFramable:i}=n(648),{error:c,ERR_EXTENDING_FRAMABLES_BLOCKED:a}=n(312);e.exports=function(e){const t=r.getOwnPropertyDescriptor(e.CustomElementRegistry.prototype,"define");t.configurable=t.writable=!0;const n=t.value;var s;t.value=(s=n,function(e,t,n){let r=n;if(n){const t=n.extends;i(t+"")&&c(a,e,n)&&(r=void 0)}return o.prototype.call.call(s,this,e,t,r)}),r.defineProperty(e.CustomElementRegistry.prototype,"define",t)}},228:(e,t,n)=>{const r=n(851),o=n(750),{shadows:i,toArray:c,getFramesArray:a,getContentWindowOfFrame:s,getOwnerWindowOfNode:u}=n(648),{Object:l,getFrameElement:p}=n(14);function f(e,t){let n=-1;for(;e[++n];){if(r(e[n],e,l))continue;if(p(e[n])===t)return e[n];const o=f(e[n],t);if(o)return o}for(let n=0;n<i.length;n++){const r=i[n];if(u(r)!==e)continue;const o=a(r,!1);for(let e=0;e<o.length;e++){const n=o[e],r=s(n);if(n===t)return r;const i=f(r,t);if(i)return i}}return null}e.exports=function(e){e=c(e);for(let t=0;t<e.length;t++){const n=e[t];if("object"!=typeof n)continue;o(n);const r=f(top,n);r&&top.SNOW_WINDOW(r)}}},328:(e,t,n)=>{const{getFramesArray:r}=n(648),{Array:o,stringToLowerCase:i,split:c,getAttribute:a,setAttribute:s,getTemplateContent:u,getChildElementCount:l,createElement:p,getInnerHTML:f,setInnerHTML:m,remove:g,DocumentFragment:d}=n(14),{warn:y,WARN_DECLARATIVE_SHADOWS:w}=n(312),E=d.prototype.querySelectorAll;function O(e,t){let n="top."+(e?"SNOW_FRAME":"SNOW_WINDOW")+"(this);";return t&&(n="<script>"+n+"document.currentScript.remove();<\/script>"),n}function h(e){let t=a(e,"onload");return!!t&&(t=O(!0,!1)+t,s(e,"onload",t),!0)}function v(e){let t=a(e,"src")||"";const[n,r]=c(t,":");return"javascript"===i(n)&&(t="javascript:"+O(!1,!1)+r,s(e,"src",t),!0)}function D(e){let t=a(e,"srcdoc");if(t){t=O(!1,!0)+t;const n=new o(t);return _(n,!0),s(e,"srcdoc",n[0]),!0}return!1}function _(e,t){for(let i=0;i<e.length;i++){const c=p(document,"template");m(c,e[i]);const a=u(c);if(!l(a))continue;let s=!1;if(t){const e=p(document,"script");e.textContent=O(!1,!1),a.insertBefore(e,a.firstChild),s=!0}const d=E.call(a,"template[shadowroot]");for(let t=0;t<d.length;t++)n=d[t],o=e[i],y(w,n,o),g(n),s=!0;const _=r(a,!1);for(let e=0;e<_.length;e++){const t=_[e];s=h(t)||s,s=v(t)||s,s=D(t)||s}s&&(e[i]=f(c))}var n,o}e.exports={handleHTML:_}},352:(e,t,n)=>{const r=n(228),o=n(832),i=n(583),c=n(459),a=n(58),{hookShadowDOM:s}=n(373),{Object:u,addEventListener:l,getFrameElement:p}=n(14),{isMarked:f,mark:m}=n(111),{error:g,ERR_PROVIDED_CB_IS_NOT_A_FUNCTION:d,ERR_MARK_NEW_WINDOW_FAILED:y}=n(312);function w(e,t){const n=u.create(null);n.value=t,u.defineProperty(top,e,n)}function E(e){try{const t=!f(e);return t&&m(e),t}catch(t){g(y,e,t)}return E(e)}function O(e){E(e)&&(function(e){!function(e){const t=p(e);l(t,"load",(function(){r(t)}))}(e),o(e),i(e),c(e,"load"),a(e),s(e)}(e),h(e))}let h;e.exports=function(e,t){if(!h){if("function"!=typeof e&&g(d,e))return;w("SNOW_WINDOW",(function(e){O(e)})),w("SNOW_FRAME",(function(e){r(e)})),h=e}O(t||top)}},58:(e,t,n)=>{const{protectShadows:r}=n(373),o=n(586),{getFramesArray:i,shadows:c}=n(648),{getParentElement:a,slice:s,Object:u,Function:l}=n(14),{handleHTML:p}=n(328),f=n(228),m={DocumentFragment:["append","prepend"],Document:["append","prepend","write","writeln"],Node:["appendChild","insertBefore","replaceChild"],Element:["innerHTML","outerHTML","insertAdjacentHTML","replaceWith","insertAdjacentElement","append","before","prepend","after"],ShadowRoot:["innerHTML"],HTMLIFrameElement:["srcdoc"]};function g(e,t){function n(e){o(e),o(c),p(e,t)}function u(e,t){const n=i(t,!1);f(n),f(e),r(!0)}return function(){const t=s(arguments),r=a(this)||this;n(t);const o=l.prototype.apply.call(e,this,t);return u(t,r),o}}e.exports=function(e){for(const t in m){const n=m[t];for(let r=0;r<n.length;r++){const o=n[r],i=u.getOwnPropertyDescriptor(e[t].prototype,o),c=i.set?"set":"value";i[c]=g(i[c],"srcdoc"===o),i.configurable=!0,"value"===c&&(i.writable=!0),u.defineProperty(e[t].prototype,o,i)}}}},459:(e,t,n)=>{const r=n(228),{removeEventListener:o,addEventListener:i,slice:c,Map:a,Object:s}=n(14),u=new a;function l(e,t,n){if(t)return t.handleEvent?t.handleEvent.apply(t,n):t.apply(e,n)}function p(e,t){return function(n,o,a){let s=o;return n===t&&(u.has(o)||u.set(o,(function(){r(this);const e=c(arguments);l(this,o,e)})),s=u.get(o)),i(this||e,n,s,a)}}function f(e,t){return function(n,r,i){let c=r;return n===t&&(c=u.get(r),u.delete(r)),o(this||e,n,c,i)}}e.exports=function(e,t){s.defineProperty(e.EventTarget.prototype,"addEventListener",{configurable:!0,writable:!0,value:p(e,t)}),s.defineProperty(e.EventTarget.prototype,"removeEventListener",{configurable:!0,writable:!0,value:f(e,t)})}},312:(e,t,n)=>{const{console:r}=n(14);e.exports={warn:function(e,t,n){let o;switch(e){case 5:const e=t,i=n;o=!1,r.warn("SNOW:","removing html string representing a declarative shadow:",e,"\n",`"${i}"`,".","\n","if this prevents your application from running correctly, please visit/report at","https://github.com/LavaMoat/snow/issues/32#issuecomment-1239273328",".");break;case 3:const c=t,a=n;o=!0,r.warn("SNOW:",o?"":"NOT",'blocking open attempt to "javascript:" url:',c,"by window: ",a,".","\n","if this prevents your application from running correctly, please visit/report at","https://github.com/LavaMoat/snow/issues/44#issuecomment-1369687802",".");break;case 2:const s=t,u=n;o=!0,r.warn("SNOW:","blocking access to property:",`"${s}"`,"of opened window: ",u,".","\n","if this prevents your application from running correctly, please visit/report at","https://github.com/LavaMoat/snow/issues/2#issuecomment-1239264255",".")}return o},error:function(e,t,n){let o;switch(e){case 6:const e=t,i=n;o=!0,r.error("SNOW:",`"${e}"`,"extending attempt","of framable elements such as provided",i,"is blocked to prevent bypass",".","\n","if this prevents your application from running correctly, please visit/report at","https://github.com/LavaMoat/snow/issues/56#issuecomment-1374899809",".","\n");break;case 1:const c=t,a=n;o=!0,r.error("SNOW:","failed to mark new window:",c,".","\n","if this prevents your application from running correctly, please visit/report at","https://github.com/LavaMoat/snow/issues/33#issuecomment-1239280063",".","\n","in order to maintain a bulletproof defense mechanism, failing to mark a new window typically causes an infinite loop",".","\n","error caught:","\n",a);break;case 4:const s=t;o=!0,r.error("SNOW:",'first argument must be of type "function", instead got:',s,".","\n","therefore, snow bailed and is not applied to the page until this is fixed.")}return o},ERR_MARK_NEW_WINDOW_FAILED:1,WARN_OPEN_API_LIMITED:2,WARN_OPEN_API_URL_ARG_JAVASCRIPT_SCHEME:3,ERR_PROVIDED_CB_IS_NOT_A_FUNCTION:4,WARN_DECLARATIVE_SHADOWS:5,ERR_EXTENDING_FRAMABLES_BLOCKED:6}},111:(e,t,n)=>{const{Map:r,Object:o,Array:i}=n(14),c=new i,a=new r;e.exports={isMarked:function(e){if(!a.has(e))return!1;const t=o.getOwnPropertyDescriptor(e,"SNOW_ID");if(!t||!o.hasOwnProperty.call(t,"value"))return!1;if("function"!=typeof t.value)return!1;const n=a.get(e);return t.value(c)===n},mark:function(e){const t=new i,n=o.create(null);n.value=e=>e===c&&t,o.defineProperty(e,"SNOW_ID",n),a.set(e,t)}}},14:e=>{e.exports=function(e){const t=function(e){const{EventTarget:t}=e;return function(e,n){const r=e.document.createElement("iframe");(e.document.head||e.document.documentElement).appendChild(r);const o=function(e){const{console:n,Proxy:r,JSON:o,Attr:i,String:c,Function:a,Map:s,Node:u,Document:l,DocumentFragment:p,ShadowRoot:f,Object:m,Reflect:g,Array:d,Element:y,HTMLElement:w,HTMLTemplateElement:E,HTMLIFrameElement:O,HTMLFrameElement:h,HTMLObjectElement:v}=e,D={console:n,Proxy:r,JSON:o,Attr:i,String:c,Function:a,Map:s,Node:u,Document:l,DocumentFragment:p,ShadowRoot:f,Object:m,Reflect:g,Array:d,Element:y,HTMLElement:w,HTMLTemplateElement:E,EventTarget:t,HTMLIFrameElement:O,HTMLFrameElement:h,HTMLObjectElement:v};return D.document={createElement:e.document.createElement},D}(r.contentWindow);return r.parentElement.removeChild(r),o}(e)}(e),{console:n,Proxy:r,Function:o,String:i,Map:c,Node:a,Document:s,DocumentFragment:u,ShadowRoot:l,Object:p,Reflect:f,Array:m,Element:g,HTMLElement:d,HTMLTemplateElement:y,EventTarget:w,HTMLIFrameElement:E,HTMLFrameElement:O,HTMLObjectElement:h}=t;return p.assign(t,{iframeContentWindow:p.getOwnPropertyDescriptor(E.prototype,"contentWindow").get,frameContentWindow:p.getOwnPropertyDescriptor(O.prototype,"contentWindow").get,objectContentWindow:p.getOwnPropertyDescriptor(h.prototype,"contentWindow").get,createElement:p.getOwnPropertyDescriptor(s.prototype,"createElement").value,slice:p.getOwnPropertyDescriptor(m.prototype,"slice").value,split:p.getOwnPropertyDescriptor(i.prototype,"split").value,nodeType:p.getOwnPropertyDescriptor(a.prototype,"nodeType").get,tagName:p.getOwnPropertyDescriptor(g.prototype,"tagName").get,getInnerHTML:p.getOwnPropertyDescriptor(g.prototype,"innerHTML").get,setInnerHTML:p.getOwnPropertyDescriptor(g.prototype,"innerHTML").set,toString:p.getOwnPropertyDescriptor(p.prototype,"toString").value,getOnload:p.getOwnPropertyDescriptor(d.prototype,"onload").get,setOnload:p.getOwnPropertyDescriptor(d.prototype,"onload").set,getAttribute:p.getOwnPropertyDescriptor(g.prototype,"getAttribute").value,setAttribute:p.getOwnPropertyDescriptor(g.prototype,"setAttribute").value,removeAttribute:p.getOwnPropertyDescriptor(g.prototype,"removeAttribute").value,remove:p.getOwnPropertyDescriptor(g.prototype,"remove").value,addEventListener:p.getOwnPropertyDescriptor(w.prototype,"addEventListener").value,removeEventListener:p.getOwnPropertyDescriptor(w.prototype,"removeEventListener").value,getTemplateContent:p.getOwnPropertyDescriptor(y.prototype,"content").get,getChildElementCount:p.getOwnPropertyDescriptor(u.prototype,"childElementCount").get,getFrameElement:p.getOwnPropertyDescriptor(e,"frameElement").get,getParentElement:p.getOwnPropertyDescriptor(a.prototype,"parentElement").get,getOwnerDocument:p.getOwnPropertyDescriptor(a.prototype,"ownerDocument").get,getDefaultView:p.getOwnPropertyDescriptor(s.prototype,"defaultView").get}),{console:n,Proxy:r,Object:p,Reflect:f,Function:o,Node:a,Element:g,Document:s,DocumentFragment:u,ShadowRoot:l,Array:m,Map:c,getContentWindow:function(e,n){switch(n){case"IFRAME":return t.iframeContentWindow.call(e);case"FRAME":return t.frameContentWindow.call(e);case"OBJECT":return t.objectContentWindow.call(e);default:return null}},stringToLowerCase:function(e){return t.String.prototype.toLowerCase.call(e)},stringStartsWith:function(e,n){return t.String.prototype.startsWith.call(e,n)},parse:function(e,n){return t.JSON.parse(e,n)},stringify:function(e,n,r){return t.JSON.stringify(e,n,r)},slice:function(e,n,r){return t.slice.call(e,n,r)},split:function(e,n){return t.split.call(e,n)},nodeType:function(e){return t.nodeType.call(e)},tagName:function(e){return t.tagName.call(e)},toString:function(e){return t.toString.call(e)},getOnload:function(e){return t.getOnload.call(e)},setOnload:function(e,n){return t.setOnload.call(e,n)},remove:function(e){return t.remove.call(e)},removeAttribute:function(e,n){return t.removeAttribute.call(e,n)},getAttribute:function(e,n){return t.getAttribute.call(e,n)},setAttribute:function(e,n,r){return t.setAttribute.call(e,n,r)},addEventListener:function(e,n,r,o){return t.addEventListener.call(e,n,r,o)},removeEventListener:function(e,n,r,o){return t.removeEventListener.call(e,n,r,o)},createElement:function(e,n,r){return t.createElement.call(e,n,r)},getInnerHTML:function(e){return t.getInnerHTML.call(e)},setInnerHTML:function(e,n){return t.setInnerHTML.call(e,n)},getTemplateContent:function(e){return t.getTemplateContent.call(e)},getChildElementCount:function(e){return t.getChildElementCount.call(e)},getFrameElement:function(e){return t.Function.prototype.call.call(t.getFrameElement,e)},getParentElement:function(e){return t.getParentElement.call(e)},getOwnerDocument:function(e){return t.getOwnerDocument.call(e)},getDefaultView:function(e){return t.getDefaultView.call(e)}}}(top)},583:(e,t,n)=>{const{stringToLowerCase:r,stringStartsWith:o,slice:i,Function:c,Object:a,Reflect:s,Proxy:u,Map:l}=n(14),{warn:p,WARN_OPEN_API_LIMITED:f,WARN_OPEN_API_URL_ARG_JAVASCRIPT_SCHEME:m}=n(312),g=new l;function d(e,t){const n=new a(null);return a.defineProperty(n,"closed",{get:function(){return t.closed}}),a.defineProperty(n,"close",{value:function(){return t.close()}}),a.defineProperty(n,"focus",{value:function(){return t.focus()}}),a.defineProperty(n,"postMessage",{value:function(e,n,r){return t.postMessage(e,n,r)}}),new u(n,{get:function(n,r){let o=s.get(n,r);return s.has(n,r)||s.has(t,r)&&(p(f,r,e)||(o=s.get(t,r))),o},set:function(){}})}e.exports=function(e){!function(e){const t=a.getOwnPropertyDescriptor(e.MessageEvent.prototype,"source"),n=t.get;t.get=function(){const e=n.call(this);return g.get(e)||e},a.defineProperty(e.MessageEvent.prototype,"source",t)}(e),e.open=function(e,t){return function(){const n=i(arguments),a=n[0]+"",s=n[1],u=n[2];if(o(r(a),"javascript")&&p(m,a,e))return null;const l=c.prototype.call.call(t,this,a,s,u);if(!l)return null;top.SNOW_WINDOW(l);const f=d(e,l);return g.set(l,f),f}}(e,e.open)}},373:(e,t,n)=>{const r=n(228),{getFramesArray:o,shadows:i}=n(648),{Object:c,Function:a}=n(14);function s(e){for(let t=0;t<i.length;t++){const n=i[t];if(e&&!n.isConnected)continue;const c=o(n,!1);r(c)}}e.exports={hookShadowDOM:function(e){const t=c.getOwnPropertyDescriptor(e.Element.prototype,"attachShadow");t.configurable=t.writable=!0;const n=t.value;var r;t.value=(r=n,function(e){const t=a.prototype.call.call(r,this,e);return i.push(t),s(!0),t}),c.defineProperty(e.Element.prototype,"attachShadow",t)},protectShadows:s}},648:(e,t,n)=>{const{tagName:r,nodeType:o,slice:i,Array:c,parse:a,stringify:s,Node:u,Document:l,DocumentFragment:p,Element:f,ShadowRoot:m,getContentWindow:g,getDefaultView:d,getOwnerDocument:y,stringToLowerCase:w}=n(14),E=new c;function O(e){return E.includes(e)}function h(e){const t=w(e);return"iframe"===t||"frame"===t||"object"===t||"embed"===t}function v(e){if(!e||"object"!=typeof e)return null;if(o(e)!==f.prototype.ELEMENT_NODE)return null;if(O(e))return null;const t=r(e);return h(t)?t:null}function D(e){return c.isArray(e)||(e=new c(e)),e}function _(e,t){let n=!1;for(let r=0;r<t.length;r++)e.includes(t[r])||(e.push(t[r]),n=!0);return n}e.exports={toArray:D,isTagFramable:h,getOwnerWindowOfNode:function(e){return d(y(e))},getContentWindowOfFrame:function(e){return g(e,v(e))},getFramesArray:function(e,t){const n=new c;if(null===e||"object"!=typeof e)return n;if("string"==typeof a(s(r=e,((e,t)=>e||r!==t?"":t)))||!function(e){if(O(e))return!0;const t=o(e);return t===f.prototype.ELEMENT_NODE||t===f.prototype.DOCUMENT_FRAGMENT_NODE||t===f.prototype.DOCUMENT_NODE}(e))return n;var r;const g=function(e){if(O(e))return m;switch(o(e)){case u.prototype.DOCUMENT_NODE:return l;case u.prototype.DOCUMENT_FRAGMENT_NODE:return p;default:return f}}(e).prototype.querySelectorAll.call(e,"iframe,frame,object,embed");return _(n,i(g)),t&&_(n,D(e)),n},getFrameTag:v,shadows:E}},626:e=>{e.exports={SRC_IS_NOT_A_WINDOW:'provided argument "src" must be a proper window of instance Window',DST_IS_NOT_A_WINDOW:'provided argument "dst" must be a proper window of instance Window',SRC_IS_NOT_SAME_ORIGIN_AS_WINDOW:'provided argument "src" must be a window in the same origin as the current context window'}},851:(e,t,n)=>{const{DST_IS_NOT_A_WINDOW:r,SRC_IS_NOT_A_WINDOW:o,SRC_IS_NOT_SAME_ORIGIN_AS_WINDOW:i}=n(626);function c(e,t){const n=t(e);return n===n.window}function a(e,t,n){return null===n.getPrototypeOf.call(t,e)}e.exports=function(e,t=window,n=window.Object){if(!c(t,n))throw new Error(o);if(!c(e,n))throw new Error(r);if(a(window,t,n))throw new Error(i);return a(e,t,n)}}},t={};function n(r){var o=t[r];if(void 0!==o)return o.exports;var i=t[r]={exports:{}};return e[r](i,i.exports,n),i.exports}n.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return n.d(t,{a:t}),t},n.d=(e,t)=>{for(var r in t)n.o(t,r)&&!n.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},n.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{"use strict";var e,t=n(352),r=n.n(t);e=top,Object.defineProperty(e,"SNOW",{value:r()})})()})();}())
-\ No newline at end of file
diff --git a/.yarn/patches/lavamoat-core-npm-12.4.0-cecca1a9b5.patch b/.yarn/patches/lavamoat-core-npm-12.4.0-cecca1a9b5.patch
deleted file mode 100644
index cbd8e71d6..000000000
--- a/.yarn/patches/lavamoat-core-npm-12.4.0-cecca1a9b5.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/kernelCoreTemplate.js b/src/kernelCoreTemplate.js
-index 255b2637167de9e5da435fe2f7ea364cfb22f86b..c229f5067a64d0a2705fa2f07085b6cac42bca9c 100644
---- a/src/kernelCoreTemplate.js
-+++ b/src/kernelCoreTemplate.js
-@@ -124,7 +124,8 @@
-         if (shouldAvoidProp(propsToAvoid, prop)) {
-           continue
-         }
--        if (Object.getOwnPropertyDescriptor(globalRef, prop)?.configurable === false) {
-+        const globalRefPropertyDescriptor = Object.getOwnPropertyDescriptor(globalRef, prop);
-+        if (globalRefPropertyDescriptor && globalRefPropertyDescriptor.configurable === false) {
-           continue
-         }
-         const desc = {
diff --git a/.yarn/patches/lavamoat-core-npm-14.0.0-0f5bdac846.patch b/.yarn/patches/lavamoat-core-npm-14.0.0-0f5bdac846.patch
deleted file mode 100644
index 589d4dea8..000000000
--- a/.yarn/patches/lavamoat-core-npm-14.0.0-0f5bdac846.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/kernelCoreTemplate.js b/src/kernelCoreTemplate.js
-index c9916f0889c17f850bffe8e5c02b3f804c9ed810..55edb49c936f28b928f74150c748fe80a9add896 100644
---- a/src/kernelCoreTemplate.js
-+++ b/src/kernelCoreTemplate.js
-@@ -138,9 +138,9 @@
-           continue
-         }
-         let desc = Object.getOwnPropertyDescriptor(globalRef, prop)
--        if (desc?.configurable === true) {
-+        if (desc && desc.configurable === true) {
-           desc = { configurable: false, set, get }
--        } else if (desc?.writable === true) {
-+        } else if (desc && desc.writable === true) {
-           const p = new Proxy(obj, { getPrototypeOf: get, get, set } )
-           desc = { configurable: false, writable: false, value: p }
-         } else {
diff --git a/app/scripts/use-snow.js b/app/scripts/use-snow.js
index 9f55d396d..11b01d78d 100644
--- a/app/scripts/use-snow.js
+++ b/app/scripts/use-snow.js
@@ -3,6 +3,6 @@
   const log = console.log.bind(console);
   const msg = 'SNOW INTERCEPTED NEW WINDOW CREATION IN METAMASK APP: ';
   window.top.SNOW((win) => {
-    log(msg, win, win && win.frameElement);
+    log(msg, win, win?.frameElement);
   });
 })();
diff --git a/development/build/index.js b/development/build/index.js
index bf7dc22ae..3e8faa372 100755
--- a/development/build/index.js
+++ b/development/build/index.js
@@ -94,7 +94,6 @@ async function defineAndRunBuildTasks() {
       'navigator',
       'harden',
       'console',
-      'location',
       // globals chrome driver needs to function (test env)
       /cdc_[a-zA-Z0-9]+_[a-zA-Z]+/iu,
       'performance',
diff --git a/package.json b/package.json
index c0e532056..2c77f9982 100644
--- a/package.json
+++ b/package.json
@@ -202,11 +202,7 @@
     "async-done@~1.3.2": "patch:async-done@npm%3A1.3.2#./.yarn/patches/async-done-npm-1.3.2-1f0a4a8997.patch",
     "async-done@^1.2.0": "patch:async-done@npm%3A1.3.2#./.yarn/patches/async-done-npm-1.3.2-1f0a4a8997.patch",
     "async-done@^1.2.2": "patch:async-done@npm%3A1.3.2#./.yarn/patches/async-done-npm-1.3.2-1f0a4a8997.patch",
-    "fast-json-patch@^3.1.1": "patch:fast-json-patch@npm%3A3.1.1#./.yarn/patches/fast-json-patch-npm-3.1.1-7e8bb70a45.patch",
-    "lavamoat-core@^14.0.0": "patch:lavamoat-core@npm%3A14.0.0#./.yarn/patches/lavamoat-core-npm-14.0.0-0f5bdac846.patch",
-    "lavamoat-core@^12.3.0": "patch:lavamoat-core@npm%3A12.4.0#./.yarn/patches/lavamoat-core-npm-12.4.0-cecca1a9b5.patch",
-    "lavamoat-core@^12.4.0": "patch:lavamoat-core@npm%3A12.4.0#./.yarn/patches/lavamoat-core-npm-12.4.0-cecca1a9b5.patch",
-    "@lavamoat/snow@^1.4.1": "patch:@lavamoat/snow@npm%3A1.4.1#./.yarn/patches/@lavamoat-snow-npm-1.4.1-405a48e593.patch"
+    "fast-json-patch@^3.1.1": "patch:fast-json-patch@npm%3A3.1.1#./.yarn/patches/fast-json-patch-npm-3.1.1-7e8bb70a45.patch"
   },
   "dependencies": {
     "@babel/runtime": "^7.5.5",
diff --git a/yarn.lock b/yarn.lock
index 1e3838669..1936a9513 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3347,7 +3347,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@lavamoat/snow@npm:1.4.1":
+"@lavamoat/snow@npm:^1.4.1":
   version: 1.4.1
   resolution: "@lavamoat/snow@npm:1.4.1"
   dependencies:
@@ -3356,15 +3356,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@lavamoat/snow@patch:@lavamoat/snow@npm%3A1.4.1#./.yarn/patches/@lavamoat-snow-npm-1.4.1-405a48e593.patch::locator=metamask-crx%40workspace%3A.":
-  version: 1.4.1
-  resolution: "@lavamoat/snow@patch:@lavamoat/snow@npm%3A1.4.1#./.yarn/patches/@lavamoat-snow-npm-1.4.1-405a48e593.patch::version=1.4.1&hash=a60c54&locator=metamask-crx%40workspace%3A."
-  dependencies:
-    is-cross-origin: ^1.0.1
-  checksum: 41bdc22e178a6af18bd1419648ca17b3d214f91e0e8ae714d614b6fb8fa02cf4699d4e488c65855b9b4b91c4d4f29868e5e095883636fdece56d699027eaaa1b
-  languageName: node
-  linkType: hard
-
 "@material-ui/core@npm:^4.11.0":
   version: 4.11.0
   resolution: "@material-ui/core@npm:4.11.0"
@@ -22813,30 +22804,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lavamoat-core@npm:12.4.0":
-  version: 12.4.0
-  resolution: "lavamoat-core@npm:12.4.0"
-  dependencies:
-    fromentries: ^1.2.0
-    json-stable-stringify: ^1.0.1
-    lavamoat-tofu: ^6.0.2
-    merge-deep: ^3.0.2
-  checksum: 432a8968035370feb51e50f35306e7f85015e3b56440dbd41b6d3eec7f4bc82c3d1f16c6a627549df2665499c49bcb6e55fa697bccc6839bac1de12804019c1d
-  languageName: node
-  linkType: hard
-
-"lavamoat-core@npm:14.0.0":
-  version: 14.0.0
-  resolution: "lavamoat-core@npm:14.0.0"
-  dependencies:
-    fromentries: ^1.2.0
-    json-stable-stringify: ^1.0.1
-    lavamoat-tofu: ^6.0.2
-    merge-deep: ^3.0.2
-  checksum: 16c2402aceba339ab25b830d476e95078edc1c978ef2623497ecb07f6b5eb8241541f67755a06cf3562680c1834b69d7e86ca421848b670378ad4fb0d62923ad
-  languageName: node
-  linkType: hard
-
 "lavamoat-core@npm:^10.0.1":
   version: 10.1.2
   resolution: "lavamoat-core@npm:10.1.2"
@@ -22850,27 +22817,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lavamoat-core@patch:lavamoat-core@npm%3A12.4.0#./.yarn/patches/lavamoat-core-npm-12.4.0-cecca1a9b5.patch::locator=metamask-crx%40workspace%3A.":
+"lavamoat-core@npm:^12.3.0, lavamoat-core@npm:^12.4.0":
   version: 12.4.0
-  resolution: "lavamoat-core@patch:lavamoat-core@npm%3A12.4.0#./.yarn/patches/lavamoat-core-npm-12.4.0-cecca1a9b5.patch::version=12.4.0&hash=05194f&locator=metamask-crx%40workspace%3A."
+  resolution: "lavamoat-core@npm:12.4.0"
   dependencies:
     fromentries: ^1.2.0
     json-stable-stringify: ^1.0.1
     lavamoat-tofu: ^6.0.2
     merge-deep: ^3.0.2
-  checksum: 746968dafef3290c0513af9f4524912df1ffd5fe7e071580e4c81dfa4375b73d4e5b6fbe68f1b8a15f5aa5fb9d1edbdd0befe423be7bdab9b09da5eb0f5ebf55
+  checksum: 432a8968035370feb51e50f35306e7f85015e3b56440dbd41b6d3eec7f4bc82c3d1f16c6a627549df2665499c49bcb6e55fa697bccc6839bac1de12804019c1d
   languageName: node
   linkType: hard
 
-"lavamoat-core@patch:lavamoat-core@npm%3A14.0.0#./.yarn/patches/lavamoat-core-npm-14.0.0-0f5bdac846.patch::locator=metamask-crx%40workspace%3A.":
+"lavamoat-core@npm:^14.0.0":
   version: 14.0.0
-  resolution: "lavamoat-core@patch:lavamoat-core@npm%3A14.0.0#./.yarn/patches/lavamoat-core-npm-14.0.0-0f5bdac846.patch::version=14.0.0&hash=fbc9b0&locator=metamask-crx%40workspace%3A."
+  resolution: "lavamoat-core@npm:14.0.0"
   dependencies:
     fromentries: ^1.2.0
     json-stable-stringify: ^1.0.1
     lavamoat-tofu: ^6.0.2
     merge-deep: ^3.0.2
-  checksum: ea6be14fbfba7f285d7a9238d78db1d3eb6a91a1b5f382152c1ce0fef1708d55fe4e730aa2663d0b36dd2c7e2abc926d79f2b8e7ce3bcfe0e4ddf7d4634e59f5
+  checksum: 16c2402aceba339ab25b830d476e95078edc1c978ef2623497ecb07f6b5eb8241541f67755a06cf3562680c1834b69d7e86ca421848b670378ad4fb0d62923ad
   languageName: node
   linkType: hard
 

From a796dbd705b5b6dcd3b03f31d7482b616f4e935c Mon Sep 17 00:00:00 2001
From: PeterYinusa <peter.yinusa@consensys.net>
Date: Tue, 14 Mar 2023 12:25:55 +0000
Subject: [PATCH 36/36] Conflict cleanup 10.26.1 master-sync

---
 app/scripts/migrations/078.js           | 38 -----------
 test/e2e/snaps/test-snap-rpc.spec.js    |  4 +-
 test/e2e/tests/failing-contract.spec.js | 88 -------------------------
 ui/helpers/utils/util.test.js           | 24 -------
 4 files changed, 1 insertion(+), 153 deletions(-)
 delete mode 100644 app/scripts/migrations/078.js

diff --git a/app/scripts/migrations/078.js b/app/scripts/migrations/078.js
deleted file mode 100644
index 7c4090574..000000000
--- a/app/scripts/migrations/078.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { cloneDeep } from 'lodash';
-import { hasProperty, isObject } from '@metamask/utils';
-
-export const version = 78;
-
-/**
- * The`@metamask/phishing-controller` state was updated in v2.0.0.
- *
- * @param originalVersionedData - Versioned MetaMask extension state, exactly what we persist to dist.
- * @param originalVersionedData.meta - State metadata.
- * @param originalVersionedData.meta.version - The current state version.
- * @param originalVersionedData.data - The persisted MetaMask state, keyed by controller.
- * @returns Updated versioned MetaMask extension state.
- */
-export default {
-  version,
-  async migrate(originalVersionedData) {
-    const versionedData = cloneDeep(originalVersionedData);
-    versionedData.meta.version = version;
-    versionedData.data = transformState(versionedData.data);
-    return versionedData;
-  },
-};
-
-function transformState(state) {
-  if (
-    !hasProperty(state, 'PhishingController') ||
-    !isObject(state.PhishingController)
-  ) {
-    return state;
-  }
-  const { PhishingController } = state;
-
-  delete PhishingController.phishing;
-  delete PhishingController.lastFetched;
-
-  return state;
-}
diff --git a/test/e2e/snaps/test-snap-rpc.spec.js b/test/e2e/snaps/test-snap-rpc.spec.js
index 22f6d6163..19715ec36 100644
--- a/test/e2e/snaps/test-snap-rpc.spec.js
+++ b/test/e2e/snaps/test-snap-rpc.spec.js
@@ -4,9 +4,7 @@ const FixtureBuilder = require('../fixture-builder');
 const { TEST_SNAPS_WEBSITE_URL } = require('./enums');
 
 describe('Test Snap RPC', function () {
-  // TODO: Re-enable this test once `test-snaps` is fixed.
-  // eslint-disable-next-line mocha/no-skipped-tests
-  it.skip('can use the cross-snap RPC endowment and produce a public key', async function () {
+  it('can use the cross-snap RPC endowment and produce a public key', async function () {
     const ganacheOptions = {
       accounts: [
         {
diff --git a/test/e2e/tests/failing-contract.spec.js b/test/e2e/tests/failing-contract.spec.js
index 4e551fd7c..b3f9bb5c0 100644
--- a/test/e2e/tests/failing-contract.spec.js
+++ b/test/e2e/tests/failing-contract.spec.js
@@ -169,91 +169,3 @@ describe('Failing contract interaction on non-EIP1559 network', function () {
     );
   });
 });
-
-describe('Failing contract interaction on non-EIP1559 network', function () {
-  const smartContract = SMART_CONTRACTS.FAILING;
-  const ganacheOptions = {
-    hardfork: 'berlin',
-    accounts: [
-      {
-        secretKey:
-          '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
-        balance: convertToHexValue(25000000000000000000),
-      },
-    ],
-  };
-  it('should display a warning when the contract interaction is expected to fail', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions,
-        smartContract,
-        title: this.test.title,
-      },
-      async ({ driver, contractRegistry }) => {
-        const contractAddress = await contractRegistry.getContractAddress(
-          smartContract,
-        );
-        await driver.navigate();
-        await driver.fill('#password', 'correct horse battery staple');
-        await driver.press('#password', driver.Key.ENTER);
-
-        await driver.openNewPage(
-          `http://127.0.0.1:8080/?contract=${contractAddress}`,
-        );
-        let windowHandles = await driver.getAllWindowHandles();
-        const extension = windowHandles[0];
-        // waits for deployed contract and calls failing contract method
-        await driver.findClickableElement('#deployButton');
-
-        await driver.fill('#toInput', contractAddress);
-        await driver.fill('#amountInput', '0');
-        await driver.fill('#gasInput', '100');
-
-        await driver.clickElement('#submitForm');
-
-        await driver.waitUntilXWindowHandles(3);
-        windowHandles = await driver.getAllWindowHandles();
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
-
-        // display warning when transaction is expected to fail
-        const warningText =
-          'We were not able to estimate gas. There might be an error in the contract and this transaction may fail.';
-        const warning = await driver.findElement(
-          '.actionable-message__message',
-        );
-        const confirmButton = await driver.findElement(
-          '[data-testid="page-container-footer-next"]',
-        );
-        assert.equal(await warning.getText(), warningText);
-        assert.equal(await confirmButton.isEnabled(), false);
-
-        // dismiss warning and confirm the transaction
-        await driver.clickElement({
-          text: 'I want to proceed anyway',
-          tag: 'button',
-        });
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        await driver.waitUntilXWindowHandles(2);
-        await driver.switchToWindow(extension);
-        await driver.clickElement({ text: 'Activity', tag: 'button' });
-        await driver.waitForSelector(
-          '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
-        );
-
-        // display the transaction status
-        const transactionStatus = await driver.findElement(
-          '.transaction-list-item:nth-of-type(1) .transaction-status-label',
-        );
-        assert.equal(await transactionStatus.getText(), 'Failed');
-      },
-    );
-  });
-});
diff --git a/ui/helpers/utils/util.test.js b/ui/helpers/utils/util.test.js
index a7ad4e99a..88184b9b6 100644
--- a/ui/helpers/utils/util.test.js
+++ b/ui/helpers/utils/util.test.js
@@ -907,28 +907,4 @@ describe('util', () => {
       ).toStrictEqual('The Quick Brown \\u202EFox Jumps Over The Lazy Dog');
     });
   });
-
-  describe('sanitizeString', () => {
-    it('should return the passed value, unchanged, if it is falsy', () => {
-      expect(util.sanitizeString('')).toStrictEqual('');
-    });
-
-    it('should return the passed value, unchanged, if it is not a string', () => {
-      expect(util.sanitizeString(true)).toStrictEqual(true);
-    });
-
-    it('should return a truthy string that oes not match the sanitizeString regex, unchanged', () => {
-      expect(
-        util.sanitizeString('The Quick Brown Fox Jumps Over The Lazy Dog'),
-      ).toStrictEqual('The Quick Brown Fox Jumps Over The Lazy Dog');
-    });
-
-    it('should return a string that matches sanitizeString regex with the matched characters replaced', () => {
-      expect(
-        util.sanitizeString(
-          'The Quick Brown \u202EFox Jumps Over The Lazy Dog',
-        ),
-      ).toStrictEqual('The Quick Brown \\u202EFox Jumps Over The Lazy Dog');
-    });
-  });
 });